Skip to content

KAFKA-8171: Set callback to null in addStopReplicaRequestForBrokers when replica … #6515

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

Closed
kehuum wants to merge 3 commits into from
Closed

KAFKA-8171: Set callback to null in addStopReplicaRequestForBrokers when replica … #6515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd9a697
Set callback to null in addStopReplicaRequestForBrokers when replica …
Mar 27, 2019
0bb43e5
Set callback to null in addStopReplicaRequestForBrokers when replica …
Mar 28, 2019
db8525e
Merge branch 'fixcallback' of https://github.com/kehuum/kafka into fi…
Mar 28, 2019
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
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/controller/ControllerChannelManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ class ControllerBrokerRequestBatch(controller: KafkaController, stateChangeLogge
stopReplicaRequestMap.getOrElseUpdate(brokerId, Seq.empty[StopReplicaRequestInfo])
val v = stopReplicaRequestMap(brokerId)
stopReplicaRequestMap(brokerId) = v :+ StopReplicaRequestInfo(PartitionAndReplica(topicPartition, brokerId),
deletePartition, (r: AbstractResponse) => callback(r, brokerId))
deletePartition, if (callback != null) (r: AbstractResponse) => callback(r, brokerId) else null)
}
}

Expand Down
4 changes: 3 additions & 1 deletion core/src/main/scala/kafka/controller/ReplicaStateMachine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ class ReplicaStateMachine(config: KafkaConfig,
replicaState.put(replica, OnlineReplica)
}
case OfflineReplica =>
// Set callback to null so that controller will send one grouped request instead of one request for
// each topic partition
validReplicas.foreach { replica =>
controllerBrokerRequestBatch.addStopReplicaRequestForBrokers(Seq(replicaId), replica.topicPartition,
deletePartition = false, (_, _) => ())
deletePartition = false, null)
}
val (replicasWithLeadershipInfo, replicasWithoutLeadershipInfo) = validReplicas.partition { replica =>
controllerContext.partitionLeadershipInfo.contains(replica.topicPartition)
Expand Down