Skip to content

[HUDI-4616][Stacked on 6386] Fixing DebeziumSource to properly commit consumed offsets #6416

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
nsivabalan merged 1 commit into from
Aug 26, 2022
Merged

[HUDI-4616][Stacked on 6386] Fixing DebeziumSource to properly commit consumed offsets #6416

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
1 change: 1 addition & 0 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ public Pair<Option<String>, JavaRDD<WriteStatus>> syncOnce() throws IOException

metrics.updateDeltaStreamerSyncMetrics(System.currentTimeMillis());

// TODO revisit (too early to unpersist)
// Clear persistent RDDs
jssc.getPersistentRDDs().values().forEach(JavaRDD::unpersist);
return result;
Expand Down
2 changes: 1 addition & 1 deletion ...-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ protected Boolean onInitializingWriteClient(SparkRDDWriteClient writeClient) {
* Close all resources.
*/
public void close() {
if (null != deltaSync) {
if (deltaSync != null) {
deltaSync.close();
}
}
Expand Down
8 changes: 8 additions & 0 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/debezium/DebeziumSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,13 @@ private static Dataset<Row> convertArrayColumnsToString(Dataset<Row> dataset) {

return dataset;
}

@Override
public void onCommit(String lastCkptStr) {
if (this.props.getBoolean(KafkaOffsetGen.Config.ENABLE_KAFKA_COMMIT_OFFSET.key(),
KafkaOffsetGen.Config.ENABLE_KAFKA_COMMIT_OFFSET.defaultValue())) {
offsetGen.commitOffsetToKafka(lastCkptStr);
}
}
}

10 changes: 7 additions & 3 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/sources/helpers/KafkaOffsetGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,13 @@ public static OffsetRange[] computeOffsetRanges(Map<TopicPartition, Long> fromOf
Comparator<OffsetRange> byPartition = Comparator.comparing(OffsetRange::partition);

// Create initial offset ranges for each 'to' partition, with from = to offsets.
OffsetRange[] ranges = new OffsetRange[toOffsetMap.size()];
toOffsetMap.keySet().stream().map(tp -> {
OffsetRange[] ranges = toOffsetMap.keySet().stream().map(tp -> {
long fromOffset = fromOffsetMap.getOrDefault(tp, 0L);
return OffsetRange.create(tp, fromOffset, fromOffset);
}).sorted(byPartition).collect(Collectors.toList()).toArray(ranges);
})
.sorted(byPartition)
.collect(Collectors.toList())
.toArray(new OffsetRange[toOffsetMap.size()]);

long allocedEvents = 0;
Set<Integer> exhaustedPartitions = new HashSet<>();
Expand Down Expand Up @@ -290,6 +292,7 @@ public OffsetRange[] getNextOffsetRanges(Option<String> lastCheckpointStr, long
numEvents = sourceLimit;
}

// TODO(HUDI-4625) remove
if (numEvents < toOffsets.size()) {
throw new HoodieException("sourceLimit should not be less than the number of kafka partitions");
}
Expand All @@ -309,6 +312,7 @@ private List<PartitionInfo> fetchPartitionInfos(KafkaConsumer consumer, String t

List<PartitionInfo> partitionInfos;
do {
// TODO(HUDI-4625) cleanup, introduce retrying client
partitionInfos = consumer.partitionsFor(topicName);
try {
TimeUnit.SECONDS.sleep(10);
Expand Down