Skip to content

KAFKA-10301: Do not clear Partition#remoteReplicasMap during partition assignment updates #9065

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
ijuma merged 7 commits into from
Jul 24, 2020
Merged

KAFKA-10301: Do not clear Partition#remoteReplicasMap during partition assignment updates #9065

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5611fd8
KAFKA-10301: Do not clear Partition#remoteReplicasMap during partitio…
stanislavkozlovski Jul 23, 2020
664b7cd
Avoid using SetOps -- trait method
stanislavkozlovski Jul 23, 2020
f6d9340
Prefer Pool#getAndMaybePut to avoid needless Replica instantiations
stanislavkozlovski Jul 23, 2020
12016f1
Add test to catch the race condition
stanislavkozlovski Jul 23, 2020
21fb575
Introduce Pool#removeAll helper method to improve readability
stanislavkozlovski Jul 23, 2020
c13e738
Move PoolTest to same package as kafka.utils.Pool
stanislavkozlovski Jul 23, 2020
0f813d6
Reduce test timeout and address stylistic comments
stanislavkozlovski Jul 23, 2020
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
6 changes: 4 additions & 2 deletions core/src/main/scala/kafka/cluster/Partition.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,11 +678,13 @@ class Partition(val topicPartition: TopicPartition,
isr: Set[Int],
addingReplicas: Seq[Int],
removingReplicas: Seq[Int]): Unit = {
remoteReplicasMap.clear()
val replicaSet = assignment.toSet
val removedReplicas = remoteReplicasMap.keys -- replicaSet

assignment
.filter(_ != localBrokerId)
.foreach(id => remoteReplicasMap.getAndMaybePut(id, new Replica(id, topicPartition)))

removedReplicas.foreach(remoteReplicasMap.remove)

@stanislavkozlovski stanislavkozlovski Jul 23, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I decided to not get fancy with refactorings - this is literally the old code (

kafka/core/src/main/scala/kafka/cluster/Partition.scala

Line 657 in 7f9187f

removedReplicas.foreach(remoteReplicasMap.remove)
))

@ijuma ijuma Jul 23, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would remoteReplicasMap --= removedReplicas work here?

@ijuma ijuma Jul 23, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, this is a Pool, so we would have to add a removeAll method. Seems easy enough though since it can call the relevant method in ConcurrentMap.

@stanislavkozlovski stanislavkozlovski Jul 23, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remoteReplicasMap --= removedReplicas doesn't compile - the remoteReplicasMap is using a Kafka Pool class which itself is using a Java Map and I don't think they support the --= notation

if (addingReplicas.nonEmpty || removingReplicas.nonEmpty)
assignmentState = OngoingReassignmentState(addingReplicas, removingReplicas, assignment)
else
Expand Down