Update ZooKeeper to 3.4.6
- Updated ZooKeeper to current stable version. (ONOS-1347)
- There are some references in scripts under old-scripts,
which has not been updated.
Change-Id: Iac96c46ee7e821bcc0e471a5c8cd8a3165a4b439
diff --git a/README.md b/README.md
index 01e7994..2eb11b1 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@
2. ZooKeeper
- Download and install apache-zookeeper-3.4.5:
+ Download and install apache-zookeeper-3.4.6:
http://zookeeper.apache.org/releases.html
- By default ONOS expect ZooKeeper to be installed in `~/zookeeper-3.4.5`.
+ By default ONOS expect ZooKeeper to be installed in `~/zookeeper-3.4.6`.
This can be changed by specifing the path using `ZK_HOME` environment variable.
Data directory ZooKeeper uses by default is `/var/lib/zookeeper`.
diff --git a/onos.sh b/onos.sh
index 0818a49..8bbae2c 100755
--- a/onos.sh
+++ b/onos.sh
@@ -10,7 +10,7 @@
# $ONOS_LOGBASE : base name of log output file (onos.`hostname`)
# $RAMCLOUD_HOME : path of root directory of RAMCloud repository (~/ramcloud)
# $RAMCLOUD_BRANCH : branch name of RAMCloud to use (master)
-# $ZK_HOME : path of root directory of ZooKeeper (~/zookeeper-3.4.5)
+# $ZK_HOME : path of root directory of ZooKeeper (~/zookeeper-3.4.6)
# $ZK_LIB_DIR : path of ZooKeeper library (/var/lib/zookeeper)
# $ZK_LOG_DIR : path of ZooKeeper log output directory (~/ONOS/onos-logs/zk-`hostname`)
# $JVM_OPTS : JVM options ONOS starts with
@@ -60,7 +60,7 @@
LOGDIR=${ONOS_LOGDIR:-${ONOS_HOME}/onos-logs}
-ZK_HOME=${ZK_HOME:-~/zookeeper-3.4.5}
+ZK_HOME=${ZK_HOME:-~/zookeeper-3.4.6}
ZK_CONF=${ZK_CONF:-${ONOS_CONF_DIR}/zoo.cfg}
ZK_CONF_TEMPLATE=${ONOS_TEMPLATE_DIR}/zoo.cfg.template
# Adding ONOS_HOST_NAME dir since file name (zookeeper.out) cannot be controlled.
diff --git a/pom.xml b/pom.xml
index c4568fb..b2e8872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,24 +591,8 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5</version>
+ <version>3.4.6</version>
<scope>runtime</scope>
- <!-- Following workaround exclusions can be removed,
- when we're ready to switch to ZooKeeper 3.4.6 -->
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/ramcloud-build-scripts/MakefragPrivateTop b/ramcloud-build-scripts/MakefragPrivateTop
index 0369292..1d58c06 100644
--- a/ramcloud-build-scripts/MakefragPrivateTop
+++ b/ramcloud-build-scripts/MakefragPrivateTop
@@ -1,4 +1,4 @@
# rewrite to match your environment
ZOOKEEPER_LIB := /usr/lib/x86_64-linux-gnu/libzookeeper_mt.a
-ZOOKEEPER_DIR := ~/zookeeper-3.4.5
+ZOOKEEPER_DIR := ~/zookeeper-3.4.6
diff --git a/sample/ONS2014demo/scripts/check-cluster-hw.sh b/sample/ONS2014demo/scripts/check-cluster-hw.sh
index 1243e3a..e7dc031 100755
--- a/sample/ONS2014demo/scripts/check-cluster-hw.sh
+++ b/sample/ONS2014demo/scripts/check-cluster-hw.sh
@@ -21,7 +21,7 @@
echo "****************************"
echo "***** ZOOKEEPER STATUS *****"
echo "****************************"
-dsh -g onos '~/zookeeper-3.4.5/bin/zkServer.sh status'
+dsh -g onos '~/zookeeper-3.4.6/bin/zkServer.sh status'
echo ""
echo "**************************"
diff --git a/vm-utils/onos.py b/vm-utils/onos.py
index ea93896..bed2be5 100755
--- a/vm-utils/onos.py
+++ b/vm-utils/onos.py
@@ -45,7 +45,7 @@
# Directories and configuration templates
home = environ[ 'HOME' ]
onosDir = home + "/ONOS"
- zookeeperDir = home + "/zookeeper-3.4.5"
+ zookeeperDir = home + "/zookeeper-3.4.6"
dirBase = '/tmp'
logDir = dirBase + '/onos-logs'
logbackFile = dirBase + '/onos-%s.logback.xml'