root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Joe Stein 2014-08-28 21:15:10 -04:00
parent aa775a199e
commit 2cdc83e85b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -197,7 +197,7 @@ project(':core') {
dependencies { dependencies {
compile project(':clients') compile project(':clients')
compile "org.scala-lang:scala-library:$scalaVersion" 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.101tec:zkclient:0.3'
compile 'com.yammer.metrics:metrics-core:2.2.0' compile 'com.yammer.metrics:metrics-core:2.2.0'
compile 'net.sf.jopt-simple:jopt-simple:3.2' compile 'net.sf.jopt-simple:jopt-simple:3.2'

4
core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala
View File

@ -19,6 +19,7 @@ package kafka.zk
import org.apache.zookeeper.server.ZooKeeperServer import org.apache.zookeeper.server.ZooKeeperServer
import org.apache.zookeeper.server.NIOServerCnxn import org.apache.zookeeper.server.NIOServerCnxn
import org.apache.zookeeper.server.NIOServerCnxnFactory
import kafka.utils.TestUtils import kafka.utils.TestUtils
import java.net.InetSocketAddress import java.net.InetSocketAddress
import kafka.utils.Utils import kafka.utils.Utils
@ -29,7 +30,8 @@ class EmbeddedZookeeper(val connectString: String) {
val tickTime = 500 val tickTime = 500
val zookeeper = new ZooKeeperServer(snapshotDir, logDir, tickTime) val zookeeper = new ZooKeeperServer(snapshotDir, logDir, tickTime)
val port = connectString.split(":")(1).toInt 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) factory.startup(zookeeper)
def shutdown() { def shutdown() {

6
system_test/utils/kafka_system_test_utils.py
View File

@ -2055,7 +2055,7 @@ def get_controller_attributes(systemTestEnv, testcaseEnv):
cmdStrList = ["ssh " + hostname, cmdStrList = ["ssh " + hostname,
"\"JAVA_HOME=" + javaHome, "\"JAVA_HOME=" + javaHome,
kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ",
"-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"],
"get /controller 2> /dev/null | tail -1\""] "get /controller 2> /dev/null | tail -1\""]
@ -2426,7 +2426,7 @@ def get_leader_for(systemTestEnv, testcaseEnv, topic, partition):
cmdStrList = ["ssh " + hostname, cmdStrList = ["ssh " + hostname,
"\"JAVA_HOME=" + javaHome, "\"JAVA_HOME=" + javaHome,
kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ",
"-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"],
zkQueryStr + " 2> /dev/null | tail -1\""] zkQueryStr + " 2> /dev/null | tail -1\""]
cmdStr = " ".join(cmdStrList) cmdStr = " ".join(cmdStrList)
@ -2470,7 +2470,7 @@ def get_leader_attributes(systemTestEnv, testcaseEnv):
cmdStrList = ["ssh " + hostname, cmdStrList = ["ssh " + hostname,
"\"JAVA_HOME=" + javaHome, "\"JAVA_HOME=" + javaHome,
kafkaRunClassBin + " org.apache.zookeeper.ZooKeeperMain", kafkaRunClassBin + " kafka.tools.ZooKeeperMainWrapper ",
"-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"], "-server " + testcaseEnv.userDefinedEnvVarDict["sourceZkConnectStr"],
zkQueryStr + " 2> /dev/null | tail -1\""] zkQueryStr + " 2> /dev/null | tail -1\""]
cmdStr = " ".join(cmdStrList) cmdStr = " ".join(cmdStrList)