kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject git commit: kafka-1271; controller logs exceptions during ZK session expiration; patched by Jun Rao; reviewed by Guozhang Wang and Jay kreps
Date Thu, 20 Feb 2014 17:44:28 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk d392f56b8 -> 90bea0b12


kafka-1271; controller logs exceptions during ZK session expiration; patched by Jun Rao; reviewed
by Guozhang Wang and Jay kreps


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

Branch: refs/heads/trunk
Commit: 90bea0b12e3944226df29d78d3aa9658cfb7799a
Parents: d392f56
Author: Jun Rao <junrao@gmail.com>
Authored: Thu Feb 20 09:44:21 2014 -0800
Committer: Jun Rao <junrao@gmail.com>
Committed: Thu Feb 20 09:44:21 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/kafka/controller/KafkaController.scala | 3 ++-
 core/src/main/scala/kafka/utils/ZkUtils.scala              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/90bea0b1/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 8acd076..00a1f98 100644
--- a/core/src/main/scala/kafka/controller/KafkaController.scala
+++ b/core/src/main/scala/kafka/controller/KafkaController.scala
@@ -335,7 +335,8 @@ class KafkaController(val config : KafkaConfig, zkClient: ZkClient) extends
Logg
    */
   def onControllerResignation() {
     inLock(controllerContext.controllerLock) {
-      autoRebalanceScheduler.shutdown()
+      if (config.autoLeaderRebalanceEnable)
+        autoRebalanceScheduler.shutdown()
       deleteTopicManager.shutdown()
       Utils.unregisterMBean(KafkaController.MBeanName)
       partitionStateMachine.shutdown()

http://git-wip-us.apache.org/repos/asf/kafka/blob/90bea0b1/core/src/main/scala/kafka/utils/ZkUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/utils/ZkUtils.scala b/core/src/main/scala/kafka/utils/ZkUtils.scala
index fa86bb9..f8e798b 100644
--- a/core/src/main/scala/kafka/utils/ZkUtils.scala
+++ b/core/src/main/scala/kafka/utils/ZkUtils.scala
@@ -101,7 +101,7 @@ object ZkUtils extends Logging {
   }
   
   def setupCommonPaths(zkClient: ZkClient) {
-    for(path <- Seq(ConsumersPath, BrokerIdsPath, BrokerTopicsPath, TopicConfigChangesPath,
TopicConfigPath))
+    for(path <- Seq(ConsumersPath, BrokerIdsPath, BrokerTopicsPath, TopicConfigChangesPath,
TopicConfigPath, DeleteTopicsPath))
       makeSurePersistentPathExists(zkClient, path)
   }
 


Mime
View raw message