Repository: kafka
Updated Branches:
  refs/heads/0.10.2 3a169837b -> c1c680e18


trivial change to clarify comments in KAFKA-4229


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

Branch: refs/heads/0.10.2
Commit: c1c680e18c01332a78848f6d837319e24daa8594
Parents: 3a16983
Author: Jun Rao <[email protected]>
Authored: Tue Jan 24 15:17:26 2017 -0800
Committer: Jun Rao <[email protected]>
Committed: Tue Jan 24 15:21:33 2017 -0800

----------------------------------------------------------------------
 core/src/main/scala/kafka/controller/KafkaController.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/c1c680e1/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 b0ed8d7..e38adf8 100644
--- a/core/src/main/scala/kafka/controller/KafkaController.scala
+++ b/core/src/main/scala/kafka/controller/KafkaController.scala
@@ -1169,7 +1169,9 @@ class KafkaController(val config: KafkaConfig, zkUtils: 
ZkUtils, val brokerState
           controllerElector.elect
         }
       } else {
-        //maybe create by current session or the previous zk session's 
ephemeral node is not deleted
+        // This can happen when there are multiple consecutive session 
expiration and handleNewSession() are called multiple
+        // times. The first call may already register the controller path 
using the newest ZK session. Therefore, the
+        // controller path will exist in subsequent calls to 
handleNewSession().
         info("ZK expired, but the current controller id %d is the same as this 
broker id, skip re-elect".format(config.brokerId))
       }
     }

Reply via email to