soarez commented on code in PR #15557:
URL: https://github.com/apache/kafka/pull/15557#discussion_r1546237766
##########
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) {
+ // Revert any reassignments for partitions that did not complete the
future replica promotion
+ val PromotionState(reassignmentState, topicId, originalDir) =
this.promotionState(topicPartition)
+ if (reassignmentState.inconsistentMetadata) {
+ directoryEventHandler.handleAssignment(new TopicIdPartition(topicId,
topicPartition.partition()), originalDir, () => ())
+ }
+
+ this.promotionStates.remove(topicPartition)
+ }
super.removePartitions(topicPartitions)
}
+ private def promotionState(topicPartition: TopicPartition): PromotionState =
promotionStates.get(topicPartition)
+
+ private def reassignmentState(topicPartition: TopicPartition):
ReassignmentState = promotionState(topicPartition).reassignmentState
+
// Visible for testing
- private[server] def updatedAssignmentRequestState(topicPartition:
TopicPartition)(state: ReplicaAlterLogDirsThread.DirectoryEventRequestState):
Unit = {
- assignmentRequestStates.put(topicPartition, state)
+ private[server] def updateReassignmentState(topicPartition: TopicPartition,
state: ReassignmentState): Unit = {
+ promotionStates.put(topicPartition,
promotionState(topicPartition).withAssignment(state))
}
private def maybePromoteFutureReplica(topicPartition: TopicPartition,
partition: Partition) = {
val topicId = partition.topicId
if (topicId.isEmpty)
throw new IllegalStateException(s"Topic ${topicPartition.topic()} does
not have an ID.")
- partitionAssignmentRequestState(topicPartition) match {
- case None =>
+ reassignmentState(topicPartition) match {
+ case ReassignmentState.None =>
// Schedule assignment request and don't promote the future replica
yet until the controller has accepted the request.
partition.runCallbackIfFutureReplicaCaughtUp(_ => {
- partition.futureReplicaDirectoryId()
- .map(id => {
- directoryEventHandler.handleAssignment(new
TopicIdPartition(topicId.get, topicPartition.partition()), id,
- () =>
updatedAssignmentRequestState(topicPartition)(ReplicaAlterLogDirsThread.COMPLETED))
- // mark the assignment request state as queued.
-
updatedAssignmentRequestState(topicPartition)(ReplicaAlterLogDirsThread.QUEUED)
- })
+ val targetDir = partition.futureReplicaDirectoryId().get
+ val topicIdPartition = new TopicIdPartition(topicId.get,
topicPartition.partition())
+ directoryEventHandler.handleAssignment(topicIdPartition, targetDir,
() => updateReassignmentState(topicPartition, ReassignmentState.Accepted))
+ updateReassignmentState(topicPartition, ReassignmentState.Queued)
})
- case Some(ReplicaAlterLogDirsThread.COMPLETED) =>
+ case ReassignmentState.Accepted =>
// Promote future replica if controller accepted the request and the
replica caught-up with the original log.
if (partition.maybeReplaceCurrentWithFutureReplica()) {
Review Comment:
Same as with L127, let's continue in the other thread.
--
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
