Upgrade zookeeper to 3.4.8.

This closes apache#93
markeijsermans · Apr 4, 2016 · b9ffcd7 · b9ffcd7
1 parent 098f93f
commit b9ffcd7
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 114 deletions.
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
@@ -51,8 +51,7 @@ EXTRA_DIST =		\
 EXTRA_DIST +=		\
   $(LEVELDB).patch
 
-# We need to patch ZooKeeper in order to get 3.4.5 to compile on
-# OS X 10.10. See: MESOS-1797.
+# We need to patch ZooKeeper in order to get 3.4.8 to compile on PPC LE.
 EXTRA_DIST +=		\
   $(ZOOKEEPER).patch
 

diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
@@ -10,5 +10,5 @@ set(LIBEV_VERSION       "4.22")
 set(LIBEVENT_VERSION    "2.1.5-beta")
 set(PICOJSON_VERSION    "1.3.0")
 set(PROTOBUF_VERSION    "2.6.1")
-set(ZOOKEEPER_VERSION   "3.4.5")
+set(ZOOKEEPER_VERSION   "3.4.8")
 set(ZLIB_VERSION        "1.2.8")
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
@@ -23,4 +23,4 @@ DISTRIBUTE_VERSION = 0.6.26
 LEVELDB_VERSION = 1.4
 PIP_VERSION = 7.1.2
 WHEEL_VERSION = 0.24.0
-ZOOKEEPER_VERSION = 3.4.5
+ZOOKEEPER_VERSION = 3.4.8
diff --git a/3rdparty/zookeeper-3.4.5.patch b/3rdparty/zookeeper-3.4.5.patch
diff --git a/3rdparty/zookeeper-3.4.5.tar.gz → 3rdparty/zookeeper-3.4.8.tar.gz b/3rdparty/zookeeper-3.4.5.tar.gz → 3rdparty/zookeeper-3.4.8.tar.gz
diff --git a/src/examples/java/test-log.in b/src/examples/java/test-log.in
@@ -20,8 +20,8 @@ test ! -e ${PROTOBUF_JAR} && \
   exit 1
 
 # TODO(vinod): Deduce the zookeeper version.
-ZOOKEEPER=${MESOS_BUILD_DIR}/3rdparty/zookeeper-3.4.5
-ZOOKEEPER_JAR=${ZOOKEEPER}/zookeeper-3.4.5.jar
+ZOOKEEPER=${MESOS_BUILD_DIR}/3rdparty/zookeeper-3.4.8
+ZOOKEEPER_JAR=${ZOOKEEPER}/zookeeper-3.4.8.jar
 
 test ! -e ${ZOOKEEPER_JAR} && \
   echo "${RED}Failed to find ${ZOOKEEPER_JAR}${NORMAL}" && \

diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in
@@ -32,7 +32,7 @@ def _create_module(module_name):
         'src', 'python', 'native_common')
 
     leveldb = os.path.join('3rdparty', 'leveldb-1.4')
-    zookeeper = os.path.join('3rdparty', 'zookeeper-3.4.5', 'src', 'c')
+    zookeeper = os.path.join('3rdparty', 'zookeeper-3.4.8', 'src', 'c')
     libprocess = os.path.join('3rdparty', 'libprocess')
 
     # Even though a statically compiled libprocess should include glog,

diff --git a/src/tests/zookeeper_test_server.cpp b/src/tests/zookeeper_test_server.cpp
@@ -139,7 +139,7 @@ int ZooKeeperTestServer::startNetwork()
     // instance will get created and everything will work out. Until
     // ZooKeeper provides mechanisms for doing in-memory testing this
     // hack (or something like it) will need to exist. This hack is
-    // specific to ZooKeeper 3.4.5 and may need to change if up
+    // specific to ZooKeeper 3.4.8 and may need to change if up
     // upgrade ZooKeeper.
     zooKeeperServer->sessionTracker = Jvm::Null();