From 68fed616803ef85d70b9ace37874829a647aa4ae Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Thu, 2 Oct 2014 18:30:17 -0700 Subject: [PATCH] KAFKA-1663. Controller unable to shutdown after a soft failure. --- core/src/main/scala/kafka/controller/TopicDeletionManager.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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, } } } - -- 1.8.5.2 (Apple Git-48)