MM2: fail-fast on truncation + auto-recover on topic reset (MirrorSourceTask) #20515
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| --- a/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceTask.java | ||
|
Contributor
There was a problem hiding this comment. This file shouldn't be checked in. |
||
| +++ b/connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceTask.java | ||
| @@ -1,5 +1,15 @@ | ||
| package org.apache.kafka.connect.mirror; | ||
|
|
||
| +import java.time.Duration; | ||
| +import java.util.concurrent.ConcurrentHashMap; | ||
| +import java.util.concurrent.ExecutionException; | ||
| +import org.apache.kafka.clients.admin.*; | ||
| +import org.apache.kafka.common.Uuid; | ||
| +import org.apache.kafka.common.errors.OffsetOutOfRangeException; | ||
| +import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; | ||
| +import org.apache.kafka.connect.errors.ConnectException; | ||
| +import org.slf4j.Logger; | ||
| +import org.slf4j.LoggerFactory; | ||
| + | ||
| import org.apache.kafka.clients.consumer.ConsumerRecord; | ||
| import org.apache.kafka.clients.consumer.ConsumerRecords; | ||
| import org.apache.kafka.clients.consumer.KafkaConsumer; | ||
| @@ -20,6 +30,12 @@ public class MirrorSourceTask extends SourceTask { | ||
| private static final Logger log = LoggerFactory.getLogger(MirrorSourceTask.class); | ||
| + private static final Logger FT_LOG = LoggerFactory.getLogger("mm2.fault.tolerance"); | ||
|
|
||
| private KafkaConsumer<byte[], byte[]> consumer; | ||
| private String sourceClusterAlias; | ||
| @@ -30,6 +36,12 @@ public class MirrorSourceTask extends SourceTask { | ||
| private boolean stopping = false; | ||
| private Semaphore consumerAccess; | ||
| private OffsetSyncWriter offsetSyncWriter; | ||
| + | ||
| + // Fault tolerance enhancements | ||
| + private Admin sourceAdmin; | ||
| + private final ConcurrentHashMap<String, Uuid> topicIds = new ConcurrentHashMap<>(); | ||
| + private boolean failOnTruncation = true; | ||
| + private boolean autoRecoverOnReset = true; | ||
| + private long topicResetRetryMs = 5000L; | ||
|
|
||
| public MirrorSourceTask() {} | ||
| @@ -89,6 +101,15 @@ public class MirrorSourceTask extends SourceTask { | ||
| consumer = MirrorUtils.newConsumer(config.sourceConsumerConfig("replication-consumer")); | ||
| Set<TopicPartition> taskTopicPartitions = config.taskTopicPartitions(); | ||
| initializeConsumer(taskTopicPartitions); | ||
| + | ||
| + // Fault tolerance configuration | ||
| + this.failOnTruncation = Boolean.parseBoolean(props.getOrDefault("mirrorsource.fail.on.truncation", "true")); | ||
| + this.autoRecoverOnReset = Boolean.parseBoolean(props.getOrDefault("mirrorsource.auto.recover.on.reset", "true")); | ||
| + this.topicResetRetryMs = Long.parseLong(props.getOrDefault("mirrorsource.topic.reset.retry.ms", "5000")); | ||
| + | ||
| + // Build AdminClient for source cluster (same configs as source consumer) | ||
| + Map<String, Object> adminProps = new HashMap<>(config.sourceConsumerConfig("replication-consumer")); | ||
| + sourceAdmin = Admin.create(adminProps); | ||
|
|
||
| log.info("{} replicating {} topic-partitions {}->{}: {}.", Thread.currentThread().getName(), | ||
| taskTopicPartitions.size(), sourceClusterAlias, config.targetClusterAlias(), taskTopicPartitions); | ||
| @@ -150,6 +171,7 @@ public class MirrorSourceTask extends SourceTask { | ||
| try { | ||
| ConsumerRecords<byte[], byte[]> records = consumer.poll(pollTimeout); | ||
| + handleTopicResetIfAny(); | ||
| List<SourceRecord> sourceRecords = new ArrayList<>(records.count()); | ||
| for (ConsumerRecord<byte[], byte[]> record : records) { | ||
| SourceRecord converted = convertRecord(record); | ||
| @@ -163,6 +185,20 @@ public class MirrorSourceTask extends SourceTask { | ||
| log.trace("Polled {} records from {}.", sourceRecords.size(), records.partitions()); | ||
| return sourceRecords; | ||
| } | ||
| + } catch (OffsetOutOfRangeException oore) { | ||
| + if (!failOnTruncation) throw oore; | ||
| + // Fail-fast with precise diagnostics | ||
| + Map<TopicPartition, Long> earliest = consumer.beginningOffsets(consumer.assignment()); | ||
| + String msg = "TRUNCATION_DETECTED: Source offsets are out of range (likely retention purge). " + | ||
| + "Earliest per partition=" + earliest + ", assignment=" + consumer.assignment(); | ||
| + FT_LOG.error(msg, oore); | ||
| + throw new ConnectException(msg, oore); | ||
| + } catch (UnknownTopicOrPartitionException utpe) { | ||
| + if (!autoRecoverOnReset) throw utpe; | ||
| + FT_LOG.warn("TOPIC_RESET_SUSPECTED: {}. Will retry metadata and resubscribe in {} ms.", utpe.getMessage(), topicResetRetryMs); | ||
| + sleep(topicResetRetryMs); | ||
| + handleTopicResetIfAny(); | ||
| + return Collections.emptyList(); | ||
| } catch (WakeupException e) { | ||
| return null; | ||
| } catch (KafkaException e) { | ||
| @@ -294,6 +330,35 @@ public class MirrorSourceTask extends SourceTask { | ||
| private boolean isUncommitted(Long offset) { | ||
| return offset == null || offset < 0; | ||
| } | ||
| + | ||
| + private void handleTopicResetIfAny() { | ||
| + if (!autoRecoverOnReset) return; | ||
| + // Describe all topics currently subscribed | ||
| + Set<String> topics = consumer.subscription(); | ||
| + if (topics.isEmpty()) return; | ||
| + try { | ||
| + DescribeTopicsResult res = sourceAdmin.describeTopics(topics); | ||
| + Map<String, TopicDescription> desc = res.all().get(); | ||
| + for (Map.Entry<String, TopicDescription> e : desc.entrySet()) { | ||
| + String t = e.getKey(); | ||
| + Uuid current = e.getValue().topicId(); | ||
| + Uuid previous = topicIds.putIfAbsent(t, current); | ||
| + if (previous != null && !previous.equals(current)) { | ||
| + FT_LOG.warn("RESET_DETECTED: Topic {} recreated (oldId={} newId={}). Seeking to beginning.", t, previous, current); | ||
| + // Seek to beginning for all assigned partitions of this topic | ||
| + Set<TopicPartition> toSeek = consumer.assignment().stream() | ||
| + .filter(tp -> tp.topic().equals(t)) | ||
| + .collect(Collectors.toSet()); | ||
| + if (!toSeek.isEmpty()) consumer.seekToBeginning(toSeek); | ||
| + } | ||
| + } | ||
| + } catch (InterruptedException ie) { | ||
| + Thread.currentThread().interrupt(); | ||
| + } catch (ExecutionException ee) { | ||
| + // If topic truly doesn't exist yet, we'll retry on next poll | ||
| + FT_LOG.debug("Topic describe failed; will retry: {}", ee.getMessage()); | ||
| + } | ||
| + } | ||
| + | ||
| + private static void sleep(long ms) { | ||
| + try { Thread.sleep(ms); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); } | ||
| + } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HashMaprequires import.