Repository: kafka Updated Branches: refs/heads/trunk 9cb59f319 -> 40948a33c
KAFKA-1663 Controller unable to shutdown after a soft failure; reviewed by Neha Narkhede Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/40948a33 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/40948a33 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/40948a33 Branch: refs/heads/trunk Commit: 40948a33c93ab7b5bdc62c7cf680538e920afa4d Parents: 9cb59f3 Author: Sriharsha Chintalapani <[email protected]> Authored: Sat Oct 4 18:09:16 2014 -0700 Committer: Neha Narkhede <[email protected]> Committed: Sat Oct 4 18:09:29 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/controller/TopicDeletionManager.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/40948a33/core/src/main/scala/kafka/controller/TopicDeletionManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/controller/TopicDeletionManager.scala b/core/src/main/scala/kafka/controller/TopicDeletionManager.scala index 219c413..6ee3de2 100644 --- a/core/src/main/scala/kafka/controller/TopicDeletionManager.scala +++ b/core/src/main/scala/kafka/controller/TopicDeletionManager.scala @@ -89,7 +89,6 @@ class TopicDeletionManager(controller: KafkaController, def start() { if (isDeleteTopicEnabled) { deleteTopicsThread = new DeleteTopicsThread() - deleteTopicStateChanged.set(true) deleteTopicsThread.start() } } @@ -214,7 +213,7 @@ class TopicDeletionManager(controller: KafkaController, */ private def awaitTopicDeletionNotification() { inLock(deleteLock) { - while(!deleteTopicsThread.isRunning.get() && !deleteTopicStateChanged.compareAndSet(true, false)) { + while(deleteTopicsThread.isRunning.get() && !deleteTopicStateChanged.compareAndSet(true, false)) { debug("Waiting for signal to start or continue topic deletion") deleteTopicsCond.await() } @@ -429,4 +428,3 @@ class TopicDeletionManager(controller: KafkaController, } } } -
