Repository: kafka Updated Branches: refs/heads/trunk aa775a199 -> 2cdc83e85
KAFKA-1485 Upgrade to Zookeeper 3.4.6 and create shim for ZKCLI so system tests can run patch by Gwen Shapira reviewed by Joe Stein 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/2cdc83e8 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/2cdc83e8 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/2cdc83e8 Branch: refs/heads/trunk Commit: 2cdc83e85b56c946eed51da6143fbe9d2d0c9d08 Parents: aa775a1 Author: Joe Stein <[email protected]> Authored: Thu Aug 28 21:15:10 2014 -0400 Committer: Joe Stein <[email protected]> Committed: Thu Aug 28 21:15:10 2014 -0400 ---------------------------------------------------------------------- build.gradle | 2 +- core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala | 4 +++- system_test/utils/kafka_system_test_utils.py | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/2cdc83e8/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b514ac8..45cf502 100644 --- a/build.gradle +++ b/build.gradle @@ -197,7 +197,7 @@ project(':core') { dependencies { compile project(':clients') compile "org.scala-lang:scala-library:$scalaVersion" - compile 'org.apache.zookeeper:zookeeper:3.3.4' + compile 'org.apache.zookeeper:zookeeper:3.4.6' compile 'com.101tec:zkclient:0.3' compile 'com.yammer.metrics:metrics-core:2.2.0' compile 'net.sf.jopt-simple:jopt-simple:3.2' http://git-wip-us.apache.org/repos/asf/kafka/blob/2cdc83e8/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala index d883bde..3021a8c 100644 --- a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala +++ b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala @@ -19,6 +19,7 @@ package kafka.zk import org.apache.zookeeper.server.ZooKeeperServer import org.apache.zookeeper.server.NIOServerCnxn +import org.apache.zookeeper.server.NIOServerCnxnFactory import kafka.utils.TestUtils import java.net.InetSocketAddress import kafka.utils.Utils @@ -29,7 +30,8 @@ class EmbeddedZookeeper(val connectString: String) { val tickTime = 500 val zookeeper = new ZooKeeperServer(snapshotDir, logDir, tickTime) val port = connectString.split(":")(1).toInt - val factory = new NIOServerCnxn.Factory(new InetSocketAddress("127.0.0.1", port)) + val factory = new NIOServerCnxnFactory() + factory.configure(new InetSocketAddress("127.0.0.1", port),0) factory.startup(zookeeper) def shutdown() { http://git-wip-us.apache.org/repos/asf/kafka/blob/2cdc83e8/system_test/utils/kafka_system_test_utils.py ---------------------------------------------------------------------- diff --git a/system_test/utils/kafka_system_test_utils.py b/system_test/utils/kafka_system_test_utils.py index fcacf0a..1093b66 100644 --- a/system_test/utils/kafka_system_test_utils.py +++ b/system_test/utils/kafka_system_test_utils.py @@ -2055,7 +2055,7 @@ def get_controller_attributes(systemTestEnv, testcaseEnv): cmdStrList = ["ssh " + hostname, "\"JAVA_HOME=" + javaHome, - kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", + kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ", "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], "get /controller 2> /dev/null | tail -1\""] @@ -2426,7 +2426,7 @@ def get_leader_for(systemTestEnv, testcaseEnv, topic, partition): cmdStrList = ["ssh " + hostname, "\"JAVA_HOME=" + javaHome, - kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", + kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ", "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], zkQueryStr + " 2> /dev/null | tail -1\""] cmdStr = " ".join(cmdStrList) @@ -2470,7 +2470,7 @@ def get_leader_attributes(systemTestEnv, testcaseEnv): cmdStrList = ["ssh " + hostname, "\"JAVA_HOME=" + javaHome, - kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", + kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ", "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], zkQueryStr + " 2> /dev/null | tail -1\""] cmdStr = " ".join(cmdStrList)
