Merge pull request #36207 from vespa-engine/hmusum/upgrade-zookeeper-client-to-3.9.5

Upgrade zookeeper client to 3.9.5

Author: hakonhall

dependency-versions/pom.xml

@@ -165,7 +165,7 @@
         <stax2-api.vespa.version>4.2.2</stax2-api.vespa.version>
         <xerces.vespa.version>2.12.2</xerces.vespa.version>
         <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version>
-        <zookeeper.client.vespa.version>3.9.4</zookeeper.client.vespa.version>
+        <zookeeper.client.vespa.version>3.9.5</zookeeper.client.vespa.version>
         <zookeeper.client.artifactId>zookeeper-server-${zookeeper.client.vespa.version}</zookeeper.client.artifactId>
         <vafer.jdependency.vespa.version>2.10</vafer.jdependency.vespa.version>
 

zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java

@@ -26,6 +26,7 @@
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.client.ZKClientConfig;
+import org.apache.zookeeper.common.ConfigException;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.server.EphemeralType;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
@@ -138,7 +139,7 @@ private static ZKClientConfig createClientConfig(Optional<File> clientConfigFile
         if (clientConfigFile.isPresent()) {
             try {
                 return new ZkClientConfigBuilder().toConfig(clientConfigFile.get().toPath());
-            } catch (QuorumPeerConfig.ConfigException e) {
+            } catch (ConfigException e) {
                 throw new RuntimeException("Unable to create ZooKeeper client config file " + clientConfigFile.get());
             } catch (IOException e) {
                 throw new UncheckedIOException(e);

zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java

@@ -4,7 +4,7 @@
 import com.yahoo.security.tls.TlsContext;
 import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils;
 import org.apache.zookeeper.client.ZKClientConfig;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
+import org.apache.zookeeper.common.ConfigException;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -41,13 +41,13 @@ public ZkClientConfigBuilder() {
         this.tlsContext = tlsContext;
     }
 
-    public ZKClientConfig toConfig(Path configFile) throws IOException, QuorumPeerConfig.ConfigException {
+    public ZKClientConfig toConfig(Path configFile) throws IOException, ConfigException {
         String configString = toConfigString();
         Files.createDirectories(configFile.getParent());
         Path tempFile = Files.createTempFile(configFile.toAbsolutePath().getParent(), "." + configFile.getFileName(), ".tmp");
         Files.writeString(tempFile, configString);
         Files.move(tempFile, configFile, StandardCopyOption.ATOMIC_MOVE);
-        return new ZKClientConfig(configFile.toString());
+        return new ZKClientConfig(configFile);
     }
 
     public ZKClientConfig toConfig() {