diff options
author | jonmv <venstad@gmail.com> | 2023-11-23 12:36:42 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-11-23 15:17:49 +0100 |
commit | 2790a62449b132a963ad3b391646c022d1a57e41 (patch) | |
tree | 10fa71912bf8823d9af5e1b5ee42828f298ad147 | |
parent | ed314cc97c3786635a859f11efbd8a70968e1bef (diff) |
Revert "Merge pull request #29435 from vespa-engine/revert-29434-jonmv/ZK-3.9.1"
This reverts commit 44cbb7e7012614d09597cd30f78e561250f3ef92, reversing
changes made to edabe158d03acf71dc54c73f036c0f12cb4d2412.
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 488702e4940..34814fab584 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -47,8 +47,9 @@ public class Configurator { // Doc says that it is max size of data in a zookeeper node, but it goes for everything that // needs to be serialized, see https://issues.apache.org/jira/browse/ZOOKEEPER-1162 for details System.setProperty(ZOOKEEPER_JUTE_MAX_BUFFER, Integer.valueOf(zookeeperServerConfig.juteMaxBuffer()).toString()); - // Need to set this as a system property instead of config, config does not work + // Need to set these as a system properties instead of config, config does not work System.setProperty("zookeeper.authProvider.x509", "com.yahoo.vespa.zookeeper.VespaMtlsAuthenticationProvider"); + System.setProperty("zookeeper.ssl.authProvider", "x509"); // Need to set this as a system property, otherwise it will be parsed for _every_ packet and an exception will be thrown (and handled) System.setProperty("zookeeper.globalOutstandingLimit", "1000"); System.setProperty("zookeeper.snapshot.compression.method", zookeeperServerConfig.snapshotMethod()); |