kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: Parameters zkSessionTimeOutMs and zkConnectionTimeoutMs are reversed in SimpleAclAuthorizer
Date Tue, 25 Oct 2016 10:35:29 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk d09267383 -> 986c15450


Parameters zkSessionTimeOutMs and zkConnectionTimeoutMs are reversed in SimpleAclAuthorizer

Also use named parameters in KafkaServer for clarity (even though it was correct previously).

Author: Matt <wangm92@163.com>

Reviewers: Guozhang Wang <wangguoz@gmail.com>, Ismael Juma <ismael@juma.me.uk>

Closes #1646 from wangzzu/wangzzu


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

Branch: refs/heads/trunk
Commit: 986c15450df8fce4a57bb606959c4ccfb4cde080
Parents: d092673
Author: wangzzu <wangm92@163.com>
Authored: Tue Oct 25 11:26:31 2016 +0100
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Tue Oct 25 11:32:57 2016 +0100

----------------------------------------------------------------------
 .../main/scala/kafka/security/auth/SimpleAclAuthorizer.scala | 4 ++--
 core/src/main/scala/kafka/server/KafkaServer.scala           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/986c1545/core/src/main/scala/kafka/security/auth/SimpleAclAuthorizer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/security/auth/SimpleAclAuthorizer.scala b/core/src/main/scala/kafka/security/auth/SimpleAclAuthorizer.scala
index 5cfdcd6..a0e7294 100644
--- a/core/src/main/scala/kafka/security/auth/SimpleAclAuthorizer.scala
+++ b/core/src/main/scala/kafka/security/auth/SimpleAclAuthorizer.scala
@@ -107,8 +107,8 @@ class SimpleAclAuthorizer extends Authorizer with Logging {
     val zkSessionTimeOutMs = configs.get(SimpleAclAuthorizer.ZkSessionTimeOutProp).map(_.toString.toInt).getOrElse(kafkaConfig.zkSessionTimeoutMs)
 
     zkUtils = ZkUtils(zkUrl,
-                      zkConnectionTimeoutMs,
-                      zkSessionTimeOutMs,
+                      sessionTimeout = zkSessionTimeOutMs,
+                      connectionTimeout = zkConnectionTimeoutMs,
                       JaasUtils.isZkSecurityEnabled())
     zkUtils.makeSurePersistentPathExists(SimpleAclAuthorizer.AclZkPath)
 

http://git-wip-us.apache.org/repos/asf/kafka/blob/986c1545/core/src/main/scala/kafka/server/KafkaServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala
index 4ba9b2a..1c7f06a 100755
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -316,8 +316,8 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime, threadNamePr
     chrootOption.foreach { chroot =>
       val zkConnForChrootCreation = config.zkConnect.substring(0, chrootIndex)
       val zkClientForChrootCreation = ZkUtils(zkConnForChrootCreation,
-                                              config.zkSessionTimeoutMs,
-                                              config.zkConnectionTimeoutMs,
+                                              sessionTimeout = config.zkSessionTimeoutMs,
+                                              connectionTimeout = config.zkConnectionTimeoutMs,
                                               secureAclsEnabled)
       zkClientForChrootCreation.makeSurePersistentPathExists(chroot)
       info(s"Created zookeeper path $chroot")
@@ -325,8 +325,8 @@ class KafkaServer(val config: KafkaConfig, time: Time = SystemTime, threadNamePr
     }
 
     val zkUtils = ZkUtils(config.zkConnect,
-                          config.zkSessionTimeoutMs,
-                          config.zkConnectionTimeoutMs,
+                          sessionTimeout = config.zkSessionTimeoutMs,
+                          connectionTimeout = config.zkConnectionTimeoutMs,
                           secureAclsEnabled)
     zkUtils.setupCommonPaths()
     zkUtils


Mime
View raw message