ZOOKEEPER-3188: fix flaky unit MultiAddress unit test

symat · Mate Szalay-Beko · commit e232c55daf99 · 2019-11-04T12:56:13.000-06:00
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerMainMultiAddressTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerMainMultiAddressTest.java
@@ -140,7 +140,7 @@ public void shouldReconfigIncrementallyByAddingMoreAddresses() throws Exception
 
     ZooKeeperAdmin zkAdmin = newZooKeeperAdmin(initialQuorumConfig);
 
-    // initiating a new incremental reconfig, by adding new ports to each server
+    // initiating a new incremental reconfig, by using the updated ports
     ReconfigTest.reconfig(zkAdmin, newQuorumConfig.buildAsStringList(), null, null, -1);
 
     checkIfZooKeeperQuorumWorks(newQuorumConfig);
@@ -166,14 +166,14 @@ public void shouldReconfigIncrementallyByDeletingSomeAddresses() throws Exceptio
 
     ZooKeeperAdmin zkAdmin = newZooKeeperAdmin(initialQuorumConfig);
 
-    // initiating a new incremental reconfig, by adding new ports to each server
+    // initiating a new incremental reconfig, by using the updated ports
     ReconfigTest.reconfig(zkAdmin, newQuorumConfig.buildAsStringList(), null, null, -1);
 
     checkIfZooKeeperQuorumWorks(newQuorumConfig);
   }
 
   @Test
-  public void shouldReconfigNonIncrementallyByChangingAllAddresses() throws Exception {
+  public void shouldReconfigNonIncrementally() throws Exception {
     // we have three ZK servers, each server has two quorumPort and two electionPort registered
     QuorumServerConfigBuilder initialQuorumConfig = new QuorumServerConfigBuilder(hostName, 3, 2);
 
@@ -182,14 +182,18 @@ public void shouldReconfigNonIncrementallyByChangingAllAddresses() throws Except
 
     checkIfZooKeeperQuorumWorks(initialQuorumConfig);
 
-    // we create a new config where no ports are the same
-    // each server will have two new quorumPorts and two new electionPorts
-    QuorumServerConfigBuilder newQuorumConfig = new QuorumServerConfigBuilder(hostName, 3, 2);
-
+    // we create a new config where we delete and add a few address for each server
+    QuorumServerConfigBuilder newQuorumConfig = new QuorumServerConfigBuilder(initialQuorumConfig)
+      .deleteLastServerAddress(FIRST_SERVER)
+      .deleteLastServerAddress(SECOND_SERVER)
+      .deleteLastServerAddress(SECOND_SERVER)
+      .deleteLastServerAddress(THIRD_SERVER)
+      .addNewServerAddress(SECOND_SERVER)
+      .addNewServerAddress(THIRD_SERVER);
 
     ZooKeeperAdmin zkAdmin = newZooKeeperAdmin(initialQuorumConfig);
 
-    // initiating a new non-incremental reconfig, by adding new ports to each server
+    // initiating a new non-incremental reconfig, by using the updated ports
     ReconfigTest.reconfig(zkAdmin, null, null, newQuorumConfig.buildAsStringList(), -1);
 
     checkIfZooKeeperQuorumWorks(newQuorumConfig);
@@ -220,7 +224,7 @@ public void shouldReconfigIncrementally_IPv6() throws Exception {
 
     ZooKeeperAdmin zkAdmin = newZooKeeperAdmin(initialQuorumConfig);
 
-    // initiating a new incremental reconfig, by adding new ports to each server
+    // initiating a new incremental reconfig, by using the updated ports
     ReconfigTest.reconfig(zkAdmin, newQuorumConfig.buildAsStringList(), null, null, -1);
 
     checkIfZooKeeperQuorumWorks(newQuorumConfig);
@@ -256,6 +260,7 @@ private void launchServers(List<QuorumServerConfigBuilder> builders) throws IOEx
   private void checkIfZooKeeperQuorumWorks(QuorumServerConfigBuilder builder) throws IOException,
     InterruptedException, KeeperException {
 
+    LOG.info("starting to verify if Quorum works");
     zNodeId += 1;
     String zNodePath = "/foo_" + zNodeId;
     ZooKeeper zk = connectToZkServer(builder, FIRST_SERVER);
@@ -272,6 +277,8 @@ private void checkIfZooKeeperQuorumWorks(QuorumServerConfigBuilder builder) thro
     assertEquals(new String(zk.getData(zNodePath, null, null)), "foobar1");
     zk.close(1000);
 
+    LOG.info("Quorum verification finished successfully");
+
   }
 
   private ZooKeeper connectToZkServer(QuorumServerConfigBuilder builder, int serverId) throws IOException, InterruptedException {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigTest.java
@@ -94,6 +94,7 @@ public static String reconfig(
         long fromConfig) throws KeeperException, InterruptedException {
         byte[] config = null;
         String failure = null;
+        LOG.info("reconfig initiated by the test");
         for (int j = 0; j < 30; j++) {
             try {
                 config = zkAdmin.reconfigure(joiningServers, leavingServers, newMembers, fromConfig, new Stat());
