Use different ports for different ZK versions

4 files changed, 31 insertions, 8 deletions

diff --git a/zookeeper-server/zookeeper-server-3.6.3/pom.xml b/zookeeper-server/zookeeper-server-3.6.3/pom.xml
index 671ff4404cd..a8ad183de4e 100644
--- a/zookeeper-server/zookeeper-server-3.6.3/pom.xml
+++ b/zookeeper-server/zookeeper-server-3.6.3/pom.xml
@@ -11,6 +11,9 @@
   <artifactId>zookeeper-server-3.6.3</artifactId>
   <packaging>container-plugin</packaging>
   <version>7-SNAPSHOT</version>
+  <properties>
+    <zookeeper.version>3.6.3</zookeeper.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -32,7 +35,7 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>3.6.3</version>
+      <version>${zookeeper.version}</version>
       <exclusions>
         <!--
           Container provides wiring for all common log libraries
@@ -96,6 +99,9 @@
         <configuration>
           <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
           <forkMode>once</forkMode>
+          <systemPropertyVariables>
+            <zk-version>${zookeeper.version}</zk-version>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>
diff --git a/zookeeper-server/zookeeper-server-3.6.3/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java b/zookeeper-server/zookeeper-server-3.6.3/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
index be59e9c89f8..da744870e42 100644
--- a/zookeeper-server/zookeeper-server-3.6.3/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
+++ b/zookeeper-server/zookeeper-server-3.6.3/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
@@ -10,9 +10,12 @@ import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.admin.ZooKeeperAdmin;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+import org.apache.zookeeper.server.ZooKeeperServerBean;
+import org.apache.zookeeper.server.ZooKeeperServerConf;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -47,8 +50,8 @@ public class VespaZooKeeperTest {
      * Then, 3 new servers are added, and the first 3 marked for retirement;
      * this should force the quorum to move the 3 new servers, but not disconnect the old ones.
      * Next, the old servers are removed.
-     * Then, 4 new servers are added.
-     * Finally, 6 servers are removed.
+     * Then, the cluster is reduced to size 1.
+     * Finally, the cluster grows to size 3 again.
      *
      * Throughout all of this, quorum should remain, and the data should remain the same.
      */
@@ -185,7 +188,11 @@ public class VespaZooKeeperTest {
             return null;
 
         Path tempDir = tempDirRoot.resolve("zookeeper-" + id);
-        int port = 59267;
+        String[] version = System.getProperty("zk-version").split("\\.");
+        int versionPortOffset = 0;
+        for (String part : version)
+            versionPortOffset = versionPortOffset * 32 + Integer.parseInt(part);
+        int port = 51000 + versionPortOffset;
         return new ZookeeperServerConfig.Builder()
                 .clientPort(port + 3 * id)
                 .dataDir(tempDir.toString())
diff --git a/zookeeper-server/zookeeper-server-3.7.0/pom.xml b/zookeeper-server/zookeeper-server-3.7.0/pom.xml
index f829df66564..01fd83a496b 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/pom.xml
+++ b/zookeeper-server/zookeeper-server-3.7.0/pom.xml
@@ -11,6 +11,9 @@
   <artifactId>zookeeper-server-3.7.0</artifactId>
   <packaging>container-plugin</packaging>
   <version>7-SNAPSHOT</version>
+  <properties>
+    <zookeeper.version>3.7.0</zookeeper.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
@@ -32,7 +35,7 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>3.7.0</version>
+      <version>${zookeeper.version}</version>
       <exclusions>
         <!--
           Container provides wiring for all common log libraries
@@ -96,6 +99,9 @@
         <configuration>
           <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
           <forkMode>once</forkMode>
+          <systemPropertyVariables>
+            <zk-version>${zookeeper.version}</zk-version>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>
diff --git a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java b/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
index be59e9c89f8..bfab1b271d3 100644
--- a/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
+++ b/zookeeper-server/zookeeper-server-3.7.0/src/test/java/com/yahoo/vespa/zookeper/VespaZooKeeperTest.java
@@ -47,8 +47,8 @@ public class VespaZooKeeperTest {
      * Then, 3 new servers are added, and the first 3 marked for retirement;
      * this should force the quorum to move the 3 new servers, but not disconnect the old ones.
      * Next, the old servers are removed.
-     * Then, 4 new servers are added.
-     * Finally, 6 servers are removed.
+     * Then, the cluster is reduced to size 1.
+     * Finally, the cluster grows to size 3 again.
      *
      * Throughout all of this, quorum should remain, and the data should remain the same.
      */
@@ -185,7 +185,11 @@ public class VespaZooKeeperTest {
             return null;
 
         Path tempDir = tempDirRoot.resolve("zookeeper-" + id);
-        int port = 59267;
+        String[] version = System.getProperty("zk-version").split("\\.");
+        int versionPortOffset = 0;
+        for (String part : version)
+            versionPortOffset = versionPortOffset * 32 + Integer.parseInt(part);
+        int port = 51000 + versionPortOffset;
         return new ZookeeperServerConfig.Builder()
                 .clientPort(port + 3 * id)
                 .dataDir(tempDir.toString())