You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ne...@apache.org on 2014/02/07 06:19:43 UTC
git commit: Minor fix for delete topic
Updated Branches:
refs/heads/trunk 1032bf740 -> 8c9a7811c
Minor fix for delete topic
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/8c9a7811
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/8c9a7811
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/8c9a7811
Branch: refs/heads/trunk
Commit: 8c9a7811c492d23b706ff2c3a728d8c49a387885
Parents: 1032bf7
Author: Neha Narkhede <ne...@gmail.com>
Authored: Thu Feb 6 21:19:34 2014 -0800
Committer: Neha Narkhede <ne...@gmail.com>
Committed: Thu Feb 6 21:19:34 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/kafka/controller/PartitionStateMachine.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/8c9a7811/core/src/main/scala/kafka/controller/PartitionStateMachine.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/controller/PartitionStateMachine.scala b/core/src/main/scala/kafka/controller/PartitionStateMachine.scala
index 487d4c8..57c96b5 100644
--- a/core/src/main/scala/kafka/controller/PartitionStateMachine.scala
+++ b/core/src/main/scala/kafka/controller/PartitionStateMachine.scala
@@ -451,7 +451,7 @@ class PartitionStateMachine(controller: KafkaController) extends Logging {
controllerContext.partitionsUndergoingPreferredReplicaElection.map(_.topic).contains(topic)
val partitionReassignmentInProgress =
controllerContext.partitionsBeingReassigned.keySet.map(_.topic).contains(topic)
- if(preferredReplicaElectionInProgress | partitionReassignmentInProgress)
+ if(preferredReplicaElectionInProgress || partitionReassignmentInProgress)
controller.deleteTopicManager.haltTopicDeletion(Set(topic))
}
}