diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-17 10:09:19 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-17 10:09:19 +0100 |
commit | ef718f980e0341cb89030bf40beaed1746a7845b (patch) | |
tree | 51e88e202a45ced00f6834013c11631b5ee1566d | |
parent | 5507bdcfb6eb0cdf06d04d0dd317302e4cb4362d (diff) |
Use Netty socket implementation for ZK client
2 files changed, 5 insertions, 0 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java index 0320a76294a..4f96bba22b0 100644 --- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java +++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java @@ -29,6 +29,7 @@ public class ZkClientConfigBuilder { public static final String SSL_ENABLED_PROTOCOLS_PROPERTY = "zookeeper.ssl.enabledProtocols"; public static final String SSL_ENABLED_CIPHERSUITES_PROPERTY = "zookeeper.ssl.ciphersuites"; public static final String SSL_CLIENTAUTH_PROPERTY = "zookeeper.ssl.clientAuth"; + public static final String CLIENT_CONNECTION_SOCKET = "zookeeper.clientCnxnSocket"; private static final TlsContext defaultTlsContext = getTlsContext().orElse(null); @@ -68,6 +69,7 @@ public class ZkClientConfigBuilder { public Map<String, String> toConfigProperties() { Map<String, String> builder = new HashMap<>(); builder.put(CLIENT_SECURE_PROPERTY, Boolean.toString(tlsContext != null)); + builder.put(CLIENT_CONNECTION_SOCKET, "org.apache.zookeeper.ClientCnxnSocketNetty"); if (tlsContext != null) { builder.put(SSL_CONTEXT_SUPPLIER_CLASS_PROPERTY, VespaSslContextProvider.class.getName()); String protocolsConfigValue = Arrays.stream(tlsContext.parameters().getProtocols()).sorted().collect(Collectors.joining(",")); diff --git a/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java b/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java index 6b4fb593cef..48bfb7ffdd8 100644 --- a/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java +++ b/zookeeper-client-common/src/test/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilderTest.java @@ -11,6 +11,7 @@ import javax.net.ssl.SSLParameters; import java.util.List; +import static com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder.CLIENT_CONNECTION_SOCKET; import static com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder.CLIENT_SECURE_PROPERTY; import static com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder.SSL_CLIENTAUTH_PROPERTY; import static com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder.SSL_CONTEXT_SUPPLIER_CLASS_PROPERTY; @@ -29,6 +30,7 @@ public class ZkClientConfigBuilderTest { ZkClientConfigBuilder builder = new ZkClientConfigBuilder(null); ZKClientConfig config = builder.toConfig(); assertEquals("false", config.getProperty(CLIENT_SECURE_PROPERTY)); + assertEquals("org.apache.zookeeper.ClientCnxnSocketNetty", config.getProperty(CLIENT_CONNECTION_SOCKET)); assertNull(config.getProperty(SSL_CONTEXT_SUPPLIER_CLASS_PROPERTY)); assertNull(config.getProperty(SSL_CLIENTAUTH_PROPERTY)); } @@ -38,6 +40,7 @@ public class ZkClientConfigBuilderTest { ZkClientConfigBuilder builder = new ZkClientConfigBuilder(new MockTlsContext()); ZKClientConfig config = builder.toConfig(); assertEquals("true", config.getProperty(CLIENT_SECURE_PROPERTY)); + assertEquals("org.apache.zookeeper.ClientCnxnSocketNetty", config.getProperty(CLIENT_CONNECTION_SOCKET)); assertEquals(com.yahoo.vespa.zookeeper.client.VespaSslContextProvider.class.getName(), config.getProperty(SSL_CONTEXT_SUPPLIER_CLASS_PROPERTY)); assertEquals("TLSv1.3", config.getProperty(SSL_ENABLED_PROTOCOLS_PROPERTY)); assertEquals("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", config.getProperty(SSL_ENABLED_CIPHERSUITES_PROPERTY)); |