Skip to content

[HUDI-5631] Improve defaults of early conflict detection configs #7770

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
xushiyan merged 1 commit into from
Jan 28, 2023
Merged

[HUDI-5631] Improve defaults of early conflict detection configs #7770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...-client-common/src/main/java/org/apache/hudi/client/embedded/EmbeddedTimelineService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ public void startServer() throws IOException {
.earlyConflictDetectionCheckCommitConflict(writeConfig.earlyConflictDetectionCheckCommitConflict())
.asyncConflictDetectorInitialDelayMs(writeConfig.getAsyncConflictDetectorInitialDelayMs())
.asyncConflictDetectorPeriodMs(writeConfig.getAsyncConflictDetectorPeriodMs())
.earlyConflictDetectionMaxAllowableHeartbeatIntervalInMs(writeConfig.getHoodieClientHeartbeatIntervalInMs());
.earlyConflictDetectionMaxAllowableHeartbeatIntervalInMs(
writeConfig.getHoodieClientHeartbeatIntervalInMs()
* writeConfig.getHoodieClientHeartbeatTolerableMisses());
}

server = new TimelineService(context, hadoopConf.newCopy(), timelineServiceConfBuilder.build(),
Expand Down
2 changes: 1 addition & 1 deletion hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ public class HoodieWriteConfig extends HoodieConfig {

public static final ConfigProperty<Long> ASYNC_CONFLICT_DETECTOR_INITIAL_DELAY_MS = ConfigProperty
.key(CONCURRENCY_PREFIX + "async.conflict.detector.initial_delay_ms")
.defaultValue(30000L)
.defaultValue(0L)
.sinceVersion("0.13.0")
.withDocumentation("Used for timeline-server-based markers with "
+ "`AsyncTimelineServerBasedDetectionStrategy`. "
Expand Down
8 changes: 4 additions & 4 deletions hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public static class Config implements Serializable {
"Used for timeline-server-based markers with "
+ "`AsyncTimelineServerBasedDetectionStrategy`. "
+ "The time in milliseconds to delay the first execution of async marker-based conflict detection.")
public Long asyncConflictDetectorInitialDelayMs = 30000L;
public Long asyncConflictDetectorInitialDelayMs = 0L;

@Parameter(names = {"--async-conflict-detector-period-ms"}, description =
"Used for timeline-server-based markers with "
Expand All @@ -157,7 +157,7 @@ public static class Config implements Serializable {
"Used for timeline-server-based markers with "
+ "`AsyncTimelineServerBasedDetectionStrategy`. "
+ "Instants whose heartbeat is greater than the current value will not be used in early conflict detection.")
public Long maxAllowableHeartbeatIntervalInMs = 60000L;
public Long maxAllowableHeartbeatIntervalInMs = 120000L;

@Parameter(names = {"--help", "-h"})
public Boolean help = false;
Expand Down Expand Up @@ -186,9 +186,9 @@ public static class Builder {
private String earlyConflictDetectionStrategy = "org.apache.hudi.timeline.service.handlers.marker.AsyncTimelineServerBasedDetectionStrategy";
private Boolean checkCommitConflict = false;
private Boolean earlyConflictDetectionEnable = false;
private Long asyncConflictDetectorInitialDelayMs = 30000L;
private Long asyncConflictDetectorInitialDelayMs = 0L;
private Long asyncConflictDetectorPeriodMs = 30000L;
private Long maxAllowableHeartbeatIntervalInMs = 60000L;
private Long maxAllowableHeartbeatIntervalInMs = 120000L;

public Builder() {
}
Expand Down