Skip to content

KAFKA-14918 Only send controller RPCs to migrating ZK brokers #13606

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
mumrah merged 3 commits into from
Apr 19, 2023
Merged

KAFKA-14918 Only send controller RPCs to migrating ZK brokers #13606

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f08c91e
Only send ZK RPCs to unfenced ZK brokers
mumrah Apr 18, 2023
4b9aa7c
Add unit test for calculateBrokerChanges
mumrah Apr 18, 2023
645140f
add license
mumrah Apr 18, 2023
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
26 changes: 18 additions & 8 deletions core/src/main/scala/kafka/migration/MigrationPropagator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,24 @@ class MigrationPropagator(

override def publishMetadata(image: MetadataImage): Unit = {
val oldImage = _image
val addedBrokers = new util.HashSet[Integer](image.cluster().brokers().keySet())
addedBrokers.removeAll(oldImage.cluster().brokers().keySet())
val removedBrokers = new util.HashSet[Integer](oldImage.cluster().brokers().keySet())
removedBrokers.removeAll(image.cluster().brokers().keySet())

removedBrokers.asScala.foreach(id => channelManager.removeBroker(id))
addedBrokers.asScala.foreach(id =>
channelManager.addBroker(Broker.fromBrokerRegistration(image.cluster().broker(id))))
val prevBrokers = oldImage.cluster().brokers().values().asScala
.filter(_.isMigratingZkBroker)
.filterNot(_.fenced)
.map(Broker.fromBrokerRegistration)
.toSet

val aliveBrokers = image.cluster().brokers().values().asScala
.filter(_.isMigratingZkBroker)
.filterNot(_.fenced)
.map(Broker.fromBrokerRegistration)
.toSet

val addedBrokers = aliveBrokers -- prevBrokers
val removedBrokers = prevBrokers -- aliveBrokers

stateChangeLogger.logger.debug(s"Adding brokers $addedBrokers, removing brokers $removedBrokers.")
Comment thread
mumrah marked this conversation as resolved.
Outdated
removedBrokers.foreach(broker => channelManager.removeBroker(broker.id))
addedBrokers.foreach(broker => channelManager.addBroker(broker))
_image = image
}

Expand Down