showuon commented on code in PR #15557: URL: https://github.com/apache/kafka/pull/15557#discussion_r1555305760
########## core/src/main/scala/kafka/server/ReplicaAlterLogDirsThread.scala: ########## @@ -96,57 +97,55 @@ class ReplicaAlterLogDirsThread(name: String, } override def removePartitions(topicPartitions: Set[TopicPartition]): Map[TopicPartition, PartitionFetchState] = { - // Schedule assignment request to revert any queued request before cancelling - for { - topicPartition <- topicPartitions - partitionState <- partitionAssignmentRequestState(topicPartition) - if partitionState == QUEUED - partition = replicaMgr.getPartitionOrException(topicPartition) - topicId <- partition.topicId - directoryId <- partition.logDirectoryId() - topicIdPartition = new TopicIdPartition(topicId, topicPartition.partition()) - } directoryEventHandler.handleAssignment(topicIdPartition, directoryId, () => ()) + for (topicPartition <- topicPartitions) { + if (this.promotionStates.containsKey(topicPartition)) { + val PromotionState(reassignmentState, topicId, originalDir) = this.promotionStates.get(topicPartition) + // Revert any reassignments for partitions that did not complete the future replica promotion + if (originalDir.isDefined && topicId.isDefined && reassignmentState.maybeInconsistentMetadata) { + directoryEventHandler.handleAssignment(new TopicIdPartition(topicId.get, topicPartition.partition()), originalDir.get, () => ()) + } + this.promotionStates.remove(topicPartition) + } Review Comment: In your opinion, if what circumstance, the `promotionStates` will not contain the topic partition? Maybe the `removePartitions` got called multiple times? I'm thinking, because before this change, we'll send out `AssignReplicasToDirsRequest` no matter what, but now, we will skip when no `PromotionState`, will that cause any potential problem? Maybe when upgrading? (Is it possible?) Should we still invoke `directoryEventHandler.handleAssignment` even if no `PromotionState`? I think no, but I'd like to hear your thought here. -- 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. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org