kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject [1/2] git commit: kafka-1663; Controller unable to shutdown after a soft failure; patched by Sriharsha Chintalapani; reviewed by Neha Narkhede and Jun Rao
Date Thu, 09 Oct 2014 21:34:53 GMT
Repository: kafka
Updated Branches:
  refs/heads/0.8.2 1ac8df1d3 -> 3d6df5494


kafka-1663; Controller unable to shutdown after a soft failure; patched by Sriharsha Chintalapani;
reviewed by Neha Narkhede and Jun Rao


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5e45b55c
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5e45b55c
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5e45b55c

Branch: refs/heads/0.8.2
Commit: 5e45b55cacb136c5c61502a4d252c081ab1314e9
Parents: 1ac8df1
Author: Sriharsha Chintalapani <schintalapani@hortonworks.com>
Authored: Thu Oct 9 14:32:29 2014 -0700
Committer: Jun Rao <junrao@gmail.com>
Committed: Thu Oct 9 14:32: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/5e45b55c/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,
     }
   }
 }
-


Mime
View raw message