KAFKA-15004: Fix configuration dual-write during migration #13767
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
…we might miss updating configs or incorrectly update them in Zookeeper. Issue#1: Topic configs are not sycned while handling snapshot. Issue#2: Any broker or topic config resource that is new and not already present in Zookeeper will never be updated in Zookeeper. Issue#3: The senstive configs are not encoded while writing them to Zookeeper.
Add readTopicConfigs to ConfigMigrationClient
mumrah
commented
May 26, 2023
| topicClient.iterateTopics( | ||
| util.EnumSet.allOf(classOf[TopicVisitorInterest]), | ||
| new TopicVisitor() { | ||
| override def visitTopic(topicName: String, topicId: Uuid, assignments: util.Map[Integer, util.List[Integer]]): Unit = { |
Member
Author
There was a problem hiding this comment.
Just fixing the indentation here
cmccabe
reviewed
May 26, 2023
| partitionRegistration.addingReplicas.foreach(brokerIdConsumer.accept(_)) | ||
| topicBatch.add(new ApiMessageAndVersion(record, 0.toShort)) | ||
| } | ||
| // This breaks the abstraction a bit, but the topic configs belong in the topic batch |
Contributor
There was a problem hiding this comment.
It's not really required for the topic config records to come right after the topics. It would be OK to do it in a separate section as we do with snapshots.
Member
Author
There was a problem hiding this comment.
I was considering the fact that we don't atomically apply the migration records during the migration. I think it's possible for the controller or broker to publish the migration metadata before it's all committed. In this case, I think it's probably safer to include the config records with the topic batch.
This won't be an issue once we implement KIP-868.
cmccabe
reviewed
May 26, 2023
metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriter.java
Outdated
Show resolved
Hide resolved
cmccabe
approved these changes
May 26, 2023
Contributor
cmccabe
left a comment
cmccabe
left a comment
There was a problem hiding this comment.
LGTM. I left two minor comments but maybe we can address those in a follow-on if needed.
Member
Author
|
Got a reasonable test run: |
mumrah
added a commit
that referenced
this pull request
May 31, 2023
This patch fixes several small bugs with configuration dual-write during migration. * Topic configs are not written back to ZK while handling snapshot. * New broker/topic configs in KRaft that did not exist in ZK will not be written to ZK. * The sensitive configs are not encoded while writing them to Zookeeper. * Handle topic configs in ConfigMigrationClient and KRaftMigrationZkWriter#handleConfigsSnapshot Added tests to ensure we no longer have the above mentioned issues. Co-authored-by: Akhilesh Chaganti <[email protected]> Reviewers: Colin P. McCabe <[email protected]>
emissionnebula
added a commit
to confluentinc/kafka
that referenced
this pull request
Jun 16, 2023
…tream-3.5 * commit 'c2f6f29ca6e1306ac77ec726bac4cd09bd1aa80b': (76 commits) KAFKA-15019: Improve handling of broker heartbeat timeouts (apache#13759) KAFKA-15003: Fix ZK sync logic for partition assignments (apache#13735) MINOR: Add 3.5 upgrade steps for ZK and KRaft (apache#13792) KAFKA-15010 ZK migration failover support (apache#13758) KAFKA-15017 Fix snapshot load in dual write mode for ClientQuotas and SCRAM (apache#13757) MINOR: Update LICENSE-binary following snappy upgrade (apache#13791) Upgrade to snappy v1.1.10.0 (apache#13786) KAFKA-15004: Fix configuration dual-write during migration (apache#13767) KAFKA-8713: JsonConverter replace.null.with.default should prevent emitting default for Struct fields (apache#13781) KAFKA-14996: Handle overly large user operations on the kcontroller (apache#13742) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR builds on top of #13736.
Fixes the following:
Added tests to ensure we no longer have the above mentioned issues.
Co-Authored-By: Akhilesh C [email protected]