Skip to content

[HUDI-5504]Fix concurrency conflict when asyncCompaction is enabled #7609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danny0405 merged 2 commits into from
Jan 9, 2023
Merged

[HUDI-5504]Fix concurrency conflict when asyncCompaction is enabled #7609

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be11f78
[HUDI-5504]Fix concurrency conflict when asyncCompaction is enabled
Jan 5, 2023
94a8e3b
minor fixes
Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ...ink-datasource/hudi-flink/src/main/java/org/apache/hudi/sink/compact/CompactOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.hudi.sink.compact;

import org.apache.flink.streaming.runtime.streamrecord.LatencyMarker;
import org.apache.hudi.client.HoodieFlinkWriteClient;

@danny0405 danny0405 Jan 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the import sequence.

import org.apache.hudi.client.WriteStatus;
import org.apache.hudi.common.model.CompactionOperation;
Expand Down Expand Up @@ -98,10 +99,16 @@ public void open() throws Exception {
}

@Override
public void processWatermark(Watermark mark) {
public void processWatermark(Watermark mark) throws Exception {
// no need to propagate the watermark

@danny0405 danny0405 Jan 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary change.

}

@Override
public void processLatencyMarker(LatencyMarker latencyMarker)
throws Exception {
// no need to propagate the latencyMarker

@danny0405 danny0405 Jan 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to throw exception.

@ThinkerLei ThinkerLei Jan 7, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@danny0405 danny0405 Jan 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ClusteringOperator should also be fixed.

@ThinkerLei ThinkerLei Jan 9, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ClusteringOperator fixed in HUDI-5515

}

@Override
public void processElement(StreamRecord<CompactionPlanEvent> record) throws Exception {
final CompactionPlanEvent event = record.getValue();
Expand All @@ -111,7 +118,9 @@ public void processElement(StreamRecord<CompactionPlanEvent> record) throws Exce
// executes the compaction task asynchronously to not block the checkpoint barrier propagate.
executor.execute(
() -> doCompaction(instantTime, compactionOperation, collector, reloadWriteConfig()),
(errMsg, t) -> collector.collect(new CompactionCommitEvent(instantTime, compactionOperation.getFileId(), taskID)),
(errMsg, t) -> {
collector.collect(new CompactionCommitEvent(instantTime,

@danny0405 danny0405 Jan 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary change.

compactionOperation.getFileId(), taskID));},
"Execute compaction for instant %s from task %d", instantTime, taskID);
} else {
// executes the compaction task synchronously for batch mode.
Expand All @@ -137,7 +146,8 @@ private void doCompaction(String instantTime,
compactionOperation,
instantTime, maxInstantTime,
writeClient.getHoodieTable().getTaskContextSupplier());
collector.collect(new CompactionCommitEvent(instantTime, compactionOperation.getFileId(), writeStatuses, taskID));
collector.collect(new CompactionCommitEvent(instantTime, compactionOperation.getFileId(),

@danny0405 danny0405 Jan 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary change.

writeStatuses, taskID));
}

private HoodieWriteConfig reloadWriteConfig() throws Exception {
Expand Down