KAFKA-19183: Replace Pool with ConcurrentHashMap #19535
Merged
+85
−233
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
Signed-off-by: PoAn Yang <[email protected]>
chia7712
reviewed
Apr 26, 2025
| @@ -43,7 +43,7 @@ abstract class AbstractFetcherManager[T <: AbstractFetcherThread](val name: Stri | |||
| metricsGroup.newGauge("MaxLag", () => { | |||
| // current max lag across all fetchers/topics/partitions | |||
| fetcherThreadMap.values.foldLeft(0L) { (curMaxLagAll, fetcherThread) => | |||
| val maxLagThread = fetcherThread.fetcherLagStats.stats.values.foldLeft(0L)((curMaxLagThread, lagMetrics) => | |||
| val maxLagThread = fetcherThread.fetcherLagStats.stats.values.asScala.foldLeft(0L)((curMaxLagThread, lagMetrics) => | |||
There was a problem hiding this comment.
val maxLagThread = fetcherThread.fetcherLagStats.stats.values.stream().mapToLong(v => v.lag).max().orElse(0L)| @@ -916,7 +915,7 @@ class FetcherLagStats(metricId: ClientIdAndBroker) { | |||
| } | |||
|
|
|||
| def unregister(): Unit = { | |||
| stats.keys.toBuffer.foreach { key: TopicPartition => | |||
| stats.keys.asScala.toBuffer.foreach { key: TopicPartition => | |||
There was a problem hiding this comment.
stats.forEach((key, _) => unregister(key))| followers.foreach(id => remoteReplicasMap.getAndMaybePut(id, new Replica(id, topicPartition, metadataCache))) | ||
| remoteReplicasMap.removeAll(removedReplicas) | ||
| followers.foreach(id => remoteReplicasMap.computeIfAbsent(id, k => new Replica(id, topicPartition, metadataCache))) | ||
| remoteReplicasMap.keySet.removeAll(removedReplicas.asJavaCollection) |
There was a problem hiding this comment.
remoteReplicasMap.keySet.removeIf(replica => !followers.contains(replica))|
|
||
| // Due to code paths accessing remoteReplicasMap without a lock, | ||
| // first add the new replicas and then remove the old ones. | ||
| followers.foreach(id => remoteReplicasMap.getAndMaybePut(id, new Replica(id, topicPartition, metadataCache))) | ||
| remoteReplicasMap.removeAll(removedReplicas) | ||
| followers.foreach(id => remoteReplicasMap.computeIfAbsent(id, k => new Replica(id, topicPartition, metadataCache))) |
| @@ -2512,7 +2510,7 @@ class ReplicaManager(val config: KafkaConfig, | |||
| trace("Evaluating ISR list of partitions to see which replicas can be removed from the ISR") | |||
|
|
|||
| // Shrink ISRs for non offline partitions | |||
| allPartitions.keys.foreach { topicPartition => | |||
| allPartitions.keys.asScala.foreach { topicPartition => | |||
There was a problem hiding this comment.
allPartitions.forEach { (topicPartition, _) =>
onlinePartition(topicPartition).foreach(_.maybeShrinkIsr())
}Signed-off-by: PoAn Yang <[email protected]>
chia7712
approved these changes
Apr 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pool.scalawithConcurrentHashMap.PoolTest.scala.Reviewers: Chia-Ping Tsai [email protected]