MM2: fail-fast on truncation + auto-recover on topic reset (MirrorSourceTask) #20515
Conversation
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
- Add fail-fast truncation detection with detailed error logging - Add graceful topic reset handling with auto-recovery - Add configuration toggles for fault tolerance features - Add AdminClient-based topic ID tracking for reset detection - Add seekToBeginning for topic reset recovery - Maintain backward compatibility with existing MM2 behavior Features: - mirrorsource.fail.on.truncation=true (default) - mirrorsource.auto.recover.on.reset=true (default) - mirrorsource.topic.reset.retry.ms=5000 (default) This addresses silent data loss scenarios and improves resilience during planned maintenance operations involving topic resets.
|
A label of 'needs-attention' was automatically added to this PR in order to raise the |
zheguang
suggested changes
Sep 30, 2025
Contributor
zheguang
left a comment
zheguang
left a comment
There was a problem hiding this comment.
The patch doesn't compile yet. Can you complete it before a formal review?
| 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")); |
| FT_LOG.warn("TOPIC_RESET_SUSPECTED: {}. Will retry metadata and resubscribe in {} ms.", utpe.getMessage(), topicResetRetryMs); | ||
| sleep(topicResetRetryMs); | ||
| handleTopicResetIfAny(); | ||
| return Collections.emptyList(); |
Contributor
There was a problem hiding this comment.
Collections requires import.
| if (topics.isEmpty()) return; | ||
| try { | ||
| DescribeTopicsResult res = sourceAdmin.describeTopics(topics); | ||
| Map<String, TopicDescription> desc = res.all().get(); |
Contributor
There was a problem hiding this comment.
DescribeTopicResult#all has private access.
| if (!toSeek.isEmpty()) consumer.seekToBeginning(toSeek); | ||
| } | ||
| } | ||
| } catch (InterruptedException ie) { |
Contributor
There was a problem hiding this comment.
Unclear who throws in the try block.
| } | ||
| } catch (InterruptedException ie) { | ||
| Thread.currentThread().interrupt(); | ||
| } catch (ExecutionException ee) { |
Contributor
There was a problem hiding this comment.
Ditto. Unclear who throws in the try block.
| @@ -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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
This PR enhances MirrorMaker 2 (MM2) with fault-tolerance capabilities to address critical data loss scenarios in cross-cluster replication setups.
Problem Statement
Vanilla MM2 has two critical gaps:
Solution
Added fault-tolerance enhancements to
MirrorSourceTask:Fail-Fast Truncation Detection
OffsetOutOfRangeExceptionduring consumer pollingConnectExceptionto fail-fast and alert operators immediatelymirrorsource.fail.on.truncation=true(default)Graceful Topic Reset Handling
AdminClientto track topic IDs and detect delete/recreate eventsUnknownTopicOrPartitionExceptionwith retry logicmirrorsource.auto.recover.on.reset=true(default)Technical Details
connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorSourceTask.javamm2.fault.tolerancefor easy filteringTesting
Impact