Repository: kafka Updated Branches: refs/heads/trunk 977ebbe9b -> 3fa0e1292
KAFKA-2965; Two variables should be exchanged. Author: unknown <[email protected]> Reviewers: Ismael Jumah, Grant Henke, Gwen Shapira Closes #646 from boweite/kafka-2965 Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/3fa0e129 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/3fa0e129 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/3fa0e129 Branch: refs/heads/trunk Commit: 3fa0e12920061788fae87a1293ebcf5e863815ae Parents: 977ebbe Author: unknown <[email protected]> Authored: Wed Dec 9 10:02:13 2015 -0800 Committer: Gwen Shapira <[email protected]> Committed: Wed Dec 9 10:02:13 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/kafka/controller/KafkaController.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/3fa0e129/core/src/main/scala/kafka/controller/KafkaController.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/controller/KafkaController.scala b/core/src/main/scala/kafka/controller/KafkaController.scala index 7c03a24..e7eef36 100755 --- a/core/src/main/scala/kafka/controller/KafkaController.scala +++ b/core/src/main/scala/kafka/controller/KafkaController.scala @@ -795,8 +795,8 @@ class KafkaController(val config : KafkaConfig, zkUtils: ZkUtils, val brokerStat val topicsQueuedForDeletion = zkUtils.getChildrenParentMayNotExist(ZkUtils.DeleteTopicsPath).toSet val topicsWithReplicasOnDeadBrokers = controllerContext.partitionReplicaAssignment.filter { case(partition, replicas) => replicas.exists(r => !controllerContext.liveBrokerIds.contains(r)) }.keySet.map(_.topic) - val topicsForWhichPartitionReassignmentIsInProgress = controllerContext.partitionsUndergoingPreferredReplicaElection.map(_.topic) - val topicsForWhichPreferredReplicaElectionIsInProgress = controllerContext.partitionsBeingReassigned.keySet.map(_.topic) + val topicsForWhichPreferredReplicaElectionIsInProgress = controllerContext.partitionsUndergoingPreferredReplicaElection.map(_.topic) + val topicsForWhichPartitionReassignmentIsInProgress = controllerContext.partitionsBeingReassigned.keySet.map(_.topic) val topicsIneligibleForDeletion = topicsWithReplicasOnDeadBrokers | topicsForWhichPartitionReassignmentIsInProgress | topicsForWhichPreferredReplicaElectionIsInProgress info("List of topics to be deleted: %s".format(topicsQueuedForDeletion.mkString(",")))
