OmniaGM commented on code in PR #14790:
URL: https://github.com/apache/kafka/pull/14790#discussion_r1403404963
##########
core/src/main/scala/kafka/server/ReplicaAlterLogDirsThread.scala:
##########
@@ -76,13 +83,69 @@ class ReplicaAlterLogDirsThread(name: String,
futureLog.updateHighWatermark(partitionData.highWatermark)
futureLog.maybeIncrementLogStartOffset(partitionData.logStartOffset,
LogStartOffsetIncrementReason.LeaderOffsetIncremented)
- if (partition.maybeReplaceCurrentWithFutureReplica())
- removePartitions(Set(topicPartition))
+ directoryEventHandler match {
+ case DirectoryEventHandler.NOOP =>
+ if (partition.maybeReplaceCurrentWithFutureReplica())
+ removePartitions(Set(topicPartition))
+ case _ =>
+ maybePromoteFutureReplica(topicPartition, partition)
+ }
quota.record(records.sizeInBytes)
logAppendInfo
}
+ 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
+ logId <- partition.logDirectoryId()
Review Comment:
renamed it
##########
server/src/main/java/org/apache/kafka/server/AssignmentsManager.java:
##########
@@ -231,13 +238,12 @@ public void run() throws Exception {
} else {
failedAttempts = 0;
AssignReplicasToDirsResponseData data =
((AssignReplicasToDirsResponse) response.responseBody()).data();
+
Set<AssignmentEvent> failed = filterFailures(data, inflight);
+ Set<AssignmentEvent> completed = Utils.diff(HashSet::new,
inflight.values().stream().collect(Collectors.toSet()), failed);
+ completed.forEach(assignmentEvent ->
assignmentEvent.callback.run());
+
log.warn("Re-queueing assignments: {}", failed);
- if (!failed.isEmpty()) {
- for (AssignmentEvent event : failed) {
- pending.put(event.partition, event);
- }
- }
Review Comment:
Nope didn't fail. I think I removed it by mistake during refactoring.
--
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
