hachikuji commented on a change in pull request #9713:
URL: https://github.com/apache/kafka/pull/9713#discussion_r544581576
##########
File path: core/src/main/scala/kafka/cluster/Partition.scala
##########
@@ -1374,47 +1314,28 @@ class Partition(val topicPartition: TopicPartition,
}
}
- private def shrinkIsrWithZk(newIsr: Set[Int]): Unit = {
- val newLeaderAndIsr = new LeaderAndIsr(localBrokerId, leaderEpoch,
newIsr.toList, zkVersion)
- val zkVersionOpt = stateStore.shrinkIsr(controllerEpoch, newLeaderAndIsr)
- if (zkVersionOpt.isDefined) {
- isrChangeListener.markShrink()
- }
- maybeUpdateIsrAndVersionWithZk(newIsr, zkVersionOpt)
- }
-
- private def maybeUpdateIsrAndVersionWithZk(isr: Set[Int], zkVersionOpt:
Option[Int]): Unit = {
- zkVersionOpt match {
- case Some(newVersion) =>
- isrState = CommittedIsr(isr)
- zkVersion = newVersion
- info("ISR updated to [%s] and zkVersion updated to
[%d]".format(isr.mkString(","), zkVersion))
-
- case None =>
- info(s"Cached zkVersion $zkVersion not equal to that in zookeeper,
skip updating ISR")
- isrChangeListener.markFailed()
- }
- }
-
private def sendAlterIsrRequest(proposedIsrState: IsrState): Unit = {
val isrToSend: Set[Int] = proposedIsrState match {
case PendingExpandIsr(isr, newInSyncReplicaId) => isr +
newInSyncReplicaId
case PendingShrinkIsr(isr, outOfSyncReplicaIds) => isr --
outOfSyncReplicaIds
case state =>
+ isrChangeListener.markFailed()
throw new IllegalStateException(s"Invalid state $state for `AlterIsr`
request for partition $topicPartition")
}
val newLeaderAndIsr = new LeaderAndIsr(localBrokerId, leaderEpoch,
isrToSend.toList, zkVersion)
- val alterIsrItem = AlterIsrItem(topicPartition, newLeaderAndIsr,
handleAlterIsrResponse(proposedIsrState))
+ val alterIsrItem = AlterIsrItem(topicPartition, newLeaderAndIsr,
handleAlterIsrResponse(proposedIsrState), controllerEpoch)
- if (!alterIsrManager.enqueue(alterIsrItem)) {
- isrChangeListener.markFailed()
- throw new IllegalStateException(s"Failed to enqueue `AlterIsr` request
with state " +
- s"$newLeaderAndIsr for partition $topicPartition")
- }
-
- isrState = proposedIsrState
- debug(s"Sent `AlterIsr` request to change state to $newLeaderAndIsr after
transition to $proposedIsrState")
+ alterIsrManager.submit(alterIsrItem, (wasSubmitted: Boolean) => {
+ if (wasSubmitted) {
+ isrState = proposedIsrState
Review comment:
Could we solve the problem by moving this above the call to `submit`?
Then the callback logic should work even if the change is made synchronously.
In the case that the request fails to be submitted, then we can reset to the
previous state. What do you think?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
