diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-01-19 07:38:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 07:38:26 +0100 |
commit | 240bd7f0ccf80ebc45fc953eded77404d11fb586 (patch) | |
tree | 94e1ebf406ef93ca78b1e940d47372c9500da865 | |
parent | ba063a6ca30deee66590efe4ae6e4e9f6ac83b5c (diff) | |
parent | cc18bdbddfcfd2cc0b796646119b56dd34dc687d (diff) |
Merge pull request #20849 from vespa-engine/hmusum/use-gz-as-zookeeper-snapshot-method-by-default
Use gz as zookeeper snapshot method by default
-rw-r--r-- | configdefinitions/src/vespa/zookeeper-server.def | 2 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def index 04632ffd35f..4d02dc67dfa 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/zookeeper-server.def @@ -51,4 +51,4 @@ tlsForClientServerCommunication enum { OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIF jksKeyStoreFile string default="conf/zookeeper/zookeeper.jks" dynamicReconfiguration bool default=false -snapshotMethod string default="" +snapshotMethod string default="gz" diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 24039aa20f4..b43a05275a4 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -351,7 +351,7 @@ public class Flags { ZONE_ID, APPLICATION_ID); public static final UnboundStringFlag ZOOKEEPER_SNAPSHOT_METHOD = defineStringFlag( - "zookeeper-snapshot-method", "", + "zookeeper-snapshot-method", "gz", List.of("hmusum"), "2022-01-11", "2022-02-11", "ZooKeeper snapshot method. Valid values are '', 'gz' and 'snappy'", "Takes effect on Docker container restart", |