From commits-return-5265-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Tue Oct 25 10:35:29 2016 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C62F7194D9 for ; Tue, 25 Oct 2016 10:35:29 +0000 (UTC) Received: (qmail 22931 invoked by uid 500); 25 Oct 2016 10:35:29 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 22905 invoked by uid 500); 25 Oct 2016 10:35:29 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 22896 invoked by uid 99); 25 Oct 2016 10:35:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2016 10:35:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 623ACDFE80; Tue, 25 Oct 2016 10:35:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ijuma@apache.org To: commits@kafka.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: kafka git commit: Parameters zkSessionTimeOutMs and zkConnectionTimeoutMs are reversed in SimpleAclAuthorizer Date: Tue, 25 Oct 2016 10:35:29 +0000 (UTC) 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 Reviewers: Guozhang Wang , Ismael Juma 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 Authored: Tue Oct 25 11:26:31 2016 +0100 Committer: Ismael Juma 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