Merge pull request #226 from DavidVujic/zookeeper_3_5_6

Zookeeper 3.5.6 and rollback for Windows client (3.4.14)
yfinkelstein · Nov 5, 2019 · b53615c · b53615c
2 parents 5a8f20f + 6147cd8
commit b53615c
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 146 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "8"
   - "10"
   - "12"
 os:

diff --git a/Dockerfile.node b/Dockerfile.node
@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:12
 
 WORKDIR /app
 

diff --git a/deps/apache-zookeeper-3.5.5.tar.gz b/deps/apache-zookeeper-3.5.5.tar.gz
diff --git a/deps/apache-zookeeper-3.5.6.tar.gz b/deps/apache-zookeeper-3.5.6.tar.gz
diff --git a/example.js b/example.js
diff --git a/patches/CMakeLists.txt b/patches/CMakeLists.txt
@@ -51,8 +51,7 @@ set(zookeeper_sources
   src/recordio.c
   generated/zookeeper.jute.c
   src/zk_log.c
-  src/zk_hashtable.c
-  src/addrvec.c)
+  src/zk_hashtable.c)
 
 list(APPEND zookeeper_sources src/st_adaptor.c)
 

diff --git a/patches/ZOOKEEPER-3078.patch b/patches/ZOOKEEPER-3078.patch
diff --git a/scripts/build.js b/scripts/build.js
@@ -33,19 +33,14 @@ if (env.isVerbose) {
 shell.cd(`${env.sourceFolder}`);
 
 if (env.isWindows) {
-    let flags = '-DWANT_SYNCAPI=OFF ';
-    let output = '';
-
-    if (!env.isVerbose) {
-        flags = '';
-        output = ' > NUL';
-    }
-    exec(`cmake ${flags}-DCMAKE_GENERATOR_PLATFORM=${process.arch} .${output}`);
+    const output = env.isVerbose ? '' : ' > NUL';
+    exec(`cmake -DWANT_SYNCAPI=OFF -DCMAKE_GENERATOR_PLATFORM=${process.arch} .${output}`);
     exec(`cmake --build .${output}`);
 } else {
     const flags = '-w';
     let configureCmd = `./configure CFLAGS='${flags}' --without-syncapi --disable-shared --with-pic --without-cppunit`;
     let makeCmd = 'make';
+
     if (!env.isVerbose) {
         configureCmd += ' --enable-silent-rules --quiet';
         makeCmd += ' --no-print-directory --quiet';

diff --git a/scripts/env.js b/scripts/env.js
@@ -22,14 +22,23 @@ const isWindows = process.platform.toLowerCase().includes('win32');
 const isSunOs = process.platform.toLowerCase().includes('sunos');
 const rootFolder = setRoot({ isWindows });
 
-// Don't forget to also update the sha1sum variable when upgrading the Zookeeper version
-const zookeeperVersion = '3.5.5';
-const downloadedFolderName = `apache-zookeeper-${zookeeperVersion}`;
+let zookeeperVersion;
+let downloadedFolderName;
+let sha512sum;
 const suffix = '.tar.gz';
-const downloadedFileName = `${downloadedFolderName}${suffix}`;
-
-// Update the checksum when upgrading the Zookeeper version
-const sha512sum = `4e22df899a83ca3cc15f6d94daadb1a8631fb4108e67b4f56d1f4fcf95f10f89c8ff1fb8a7c84799a3856d8803a8db1e1f2f3fe1b7dc0d6cedf485ef90fd212d  ${downloadedFileName}`;
+let downloadedFileName;
+
+if (isWindows) {
+    zookeeperVersion = '3.4.14';
+    downloadedFolderName = `zookeeper-${zookeeperVersion}`;
+    downloadedFileName = `${downloadedFolderName}${suffix}`;
+    sha512sum = `b2e03d95f8cf18b97a46e2f53871cef5a5da9d5d80b97009375aed7fb35368c440ca944c7e8b64efabbc065f6fb98bb86239f7c1491f0490efc71876d5a7f424  ${downloadedFileName}`;
+} else {
+    zookeeperVersion = '3.5.6';
+    downloadedFolderName = `apache-zookeeper-${zookeeperVersion}`;
+    downloadedFileName = `${downloadedFolderName}${suffix}`;
+    sha512sum = `7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0  ${downloadedFileName}`;
+}
 
 const variables = {
     rootFolder,

diff --git a/scripts/prepublish.js b/scripts/prepublish.js
@@ -53,7 +53,7 @@ function validateFile(fileName) {
     }
 
     if (res !== env.sha512sum) {
-        throw new Error(`Wrong sha512 for ${fileName}! Expected "${env.sha512sum}", got "${res}".`);
+        throw new Error(`Wrong sha for ${fileName}! Expected "${env.sha512sum}", got "${res}".`);
     }
 }
 
@@ -89,8 +89,6 @@ function applyPatches() {
             shell.cp(`${env.patchesFolder}/${cmakeFile}`, `${env.sourceFolder}/${cmakeFile}`);
         }
     } else {
-        exec(`patch -p0 < ${env.patchesFolder}/ZOOKEEPER-3078.patch`);
-
         decompress(`${env.patchesFolder}/autoreconf.tar.gz`, `${env.patchesFolder}`, {
             plugins: [
                 decompressTargz(),