GH-1251: Upgrade Zookeeper to 3.9.3 (#1252)

Closes #1251.

Co-authored-by: Amina Dinari <[email protected]>
Co-authored-by: Kezhu Wang <[email protected]>

Author: 3 people

curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java

@@ -479,7 +479,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
             try {
                 client.checkExists().forPath("/");
                 fail("Connection should be down");
-            } catch (KeeperException.ConnectionLossException e) {
+            } catch (KeeperException.ConnectionLossException | KeeperException.SessionExpiredException e) {
                 // expected
             }
 

curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java

@@ -165,7 +165,7 @@ public void close() throws IOException {
 
         try {
             if (zkServer != null) {
-                zkServer.shutdown();
+                zkServer.customShutdown();
                 ZKDatabase zkDb = zkServer.getZKDatabase();
                 if (zkDb != null) {
                     // make ZK server close its log files
@@ -209,7 +209,7 @@ private void internalRunFromConfig(ServerConfig config) throws IOException {
             latch.countDown();
             cnxnFactory.join();
             if ((zkServer != null) && zkServer.isRunning()) {
-                zkServer.shutdown();
+                zkServer.customShutdown();
             }
         } catch (InterruptedException e) {
             // warn, but generally this is ok
@@ -255,9 +255,8 @@ public TestZooKeeperServer(FileTxnSnapLog txnLog, ServerConfig config) {
             this.setMaxSessionTimeout(config.getMaxSessionTimeout());
         }
 
-        @Override
-        public synchronized void shutdown(boolean fullyShutDown) {
-            super.shutdown(fullyShutDown);
+        public synchronized void customShutdown() {
+            super.shutdown();
             try {
                 txnLog.close();
             } catch (IOException e) {

pom.xml

@@ -72,7 +72,7 @@
         <redirectTestOutputToFile>true</redirectTestOutputToFile>
 
         <!-- versions -->
-        <zookeeper-version>3.9.2</zookeeper-version>
+        <zookeeper-version>3.9.3</zookeeper-version>
         <maven-bundle-plugin-version>5.1.4</maven-bundle-plugin-version>
         <maven-compiler-plugin-version>3.10.0</maven-compiler-plugin-version>
         <maven-dependency-plugin-version>3.2.0</maven-dependency-plugin-version>