KAFKA-18225: ClientQuotaCallback#updateClusterMetadata is unsupported by kraft #18196
+388
−21
There are no files selected for viewing
This file contains 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 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 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 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 |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ | |
|
|
||
| package kafka.server.metadata | ||
|
|
||
| import kafka.server.metadata.KRaftMetadataCache.{getOfflineReplicas, getRandomAliveBroker} | ||
| import kafka.server.{CachedControllerId, KRaftCachedControllerId, MetadataCache} | ||
| import kafka.utils.Logging | ||
| import org.apache.kafka.admin.BrokerMetadata | ||
|
|
@@ -209,28 +210,7 @@ class KRaftMetadataCache( | |
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get the endpoint matching the provided listener if the broker is alive. Note that listeners can | ||
| * be added dynamically, so a broker with a missing listener could be a transient error. | ||
|
|
@@ -364,12 +344,7 @@ class KRaftMetadataCache( | |
| Option(_currentImage.cluster.broker(brokerId)).count(_.inControlledShutdown) == 1 | ||
| } | ||
|
|
||
| override def getAliveBrokers(): Iterable[BrokerMetadata] = KRaftMetadataCache.getAliveBrokers(_currentImage) | ||
|
|
||
| override def getAliveBrokerNode(brokerId: Int, listenerName: ListenerName): Option[Node] = { | ||
| Option(_currentImage.cluster().broker(brokerId)).filterNot(_.fenced()). | ||
|
|
@@ -463,15 +438,6 @@ class KRaftMetadataCache( | |
| getRandomAliveBroker(_currentImage) | ||
| } | ||
|
|
||
| def getAliveBrokerEpoch(brokerId: Int): Option[Long] = { | ||
| Option(_currentImage.cluster().broker(brokerId)).filterNot(_.fenced()). | ||
| map(brokerRegistration => brokerRegistration.epoch()) | ||
|
|
@@ -565,3 +531,97 @@ class KRaftMetadataCache( | |
| } | ||
| } | ||
|
|
||
| object KRaftMetadataCache { | ||
|
There was a problem hiding this comment. #18632 is trying to remove reference of |
||
|
|
||
| def toCluster(clusterId: String, image: MetadataImage): Cluster = { | ||
|
There was a problem hiding this comment. This result is different with |
||
| val brokerToNodes = new util.HashMap[Integer, java.util.List[Node]] | ||
| image.cluster().brokers() | ||
| .values().stream() | ||
| .filter(broker => !broker.fenced()) | ||
| .forEach { broker => brokerToNodes.put(broker.id(), broker.nodes()) } | ||
|
|
||
| def nodes(id: Int): java.util.List[Node] = brokerToNodes.get(id) | ||
|
|
||
| val partitionInfos = new util.ArrayList[PartitionInfo] | ||
| val internalTopics = new util.HashSet[String] | ||
|
|
||
| def toArray(replicas: Array[Int]): Array[Node] = { | ||
| util.Arrays.stream(replicas) | ||
| .mapToObj(replica => nodes(replica)) | ||
| .flatMap(replica => replica.stream()).toArray(size => new Array[Node](size)) | ||
| } | ||
|
|
||
|
|
||
| val topicImages = image.topics().topicsByName().values() | ||
| if (topicImages != null) { | ||
| topicImages.forEach { topic => | ||
| topic.partitions().forEach { (key, value) => | ||
| val partitionId = key | ||
| val partition = value | ||
| val nodes1 = nodes(partition.leader) | ||
| if (nodes1 != null) { | ||
| nodes1.forEach(node => { | ||
| partitionInfos.add(new PartitionInfo(topic.name(), | ||
| partitionId, | ||
| node, | ||
| toArray(partition.replicas), | ||
| toArray(partition.isr), | ||
| getOfflineReplicas(image, partition).stream() | ||
| .map(replica => nodes(replica)) | ||
| .flatMap(replica => replica.stream()).toArray(size => new Array[Node](size)))) | ||
| }) | ||
| if (Topic.isInternal(topic.name())) { | ||
| internalTopics.add(topic.name()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val controllerNode = nodes(getRandomAliveBroker(image).getOrElse(-1)) match { | ||
| case null => Node.noNode() | ||
| case nodes => nodes.get(0) | ||
| } | ||
| // Note: the constructor of Cluster does not allow us to reference unregistered nodes. | ||
| // So, for example, if partition foo-0 has replicas [1, 2] but broker 2 is not | ||
| // registered, we pass its replicas as [1, -1]. This doesn't make a lot of sense, but | ||
| // we are duplicating the behavior of ZkMetadataCache, for now. | ||
| new Cluster(clusterId, brokerToNodes.values().stream().flatMap(n => n.stream()).collect(util.stream.Collectors.toList()), | ||
| partitionInfos, Collections.emptySet(), internalTopics, controllerNode) | ||
| } | ||
|
|
||
| private def getOfflineReplicas(image: MetadataImage, | ||
| partition: PartitionRegistration, | ||
| listenerName: ListenerName = null): util.List[Integer] = { | ||
| val offlineReplicas = new util.ArrayList[Integer](0) | ||
| for (brokerId <- partition.replicas) { | ||
| Option(image.cluster().broker(brokerId)) match { | ||
| case None => offlineReplicas.add(brokerId) | ||
| case Some(broker) => if (listenerName == null || isReplicaOffline(partition, listenerName, broker)) { | ||
| offlineReplicas.add(brokerId) | ||
| } | ||
| } | ||
| } | ||
| offlineReplicas | ||
| } | ||
|
|
||
| private def isReplicaOffline(partition: PartitionRegistration, listenerName: ListenerName, broker: BrokerRegistration) = | ||
| broker.fenced() || !broker.listeners().containsKey(listenerName.value()) || isReplicaInOfflineDir(broker, partition) | ||
|
|
||
| private def isReplicaInOfflineDir(broker: BrokerRegistration, partition: PartitionRegistration): Boolean = | ||
| !broker.hasOnlineDir(partition.directory(broker.id())) | ||
|
|
||
| private def getRandomAliveBroker(image: MetadataImage): Option[Int] = { | ||
| val aliveBrokers = getAliveBrokers(image).toList | ||
| if (aliveBrokers.isEmpty) { | ||
| None | ||
| } else { | ||
| Some(aliveBrokers(ThreadLocalRandom.current().nextInt(aliveBrokers.size)).id) | ||
| } | ||
| } | ||
|
|
||
| private def getAliveBrokers(image: MetadataImage): Iterable[BrokerMetadata] = { | ||
| image.cluster().brokers().values().asScala.filterNot(_.fenced()). | ||
| map(b => new BrokerMetadata(b.id, b.rack)) | ||
| } | ||
| } | ||
This file contains 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 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
Oops, something went wrong.
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.
we should use the callback in
quotaManagersrather than creating a new one! They are different instances and so this approach can update the callback used byquotaManagers