Merge pull request #25837 from vespa-engine/mpolden/zk-compression-feature-flag

Re-introduce ZooKeeper compression method flag

5 files changed, 27 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 8f257110a04..4bec9123b77 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -86,6 +86,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
         }
 
         builder.dynamicReconfiguration(options.hostedVespa().orElse(false));
+        builder.snapshotMethod(options.zooKeeperSnapshotMethod());
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index f342aa1a2bf..256d39422ff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -37,4 +37,6 @@ public interface CloudConfigOptions {
     Optional<String> loadBalancerAddress();
     Optional<String> athenzDnsSuffix();
     Optional<String> ztsUrl();
+    String zooKeeperSnapshotMethod();
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 95c3262f2f5..f84612fd598 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.container.configserver;
 
 import com.yahoo.vespa.model.container.configserver.option.CloudConfigOptions;
 
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -17,6 +18,7 @@ public class TestOptions implements CloudConfigOptions {
     private Optional<String> region = Optional.empty();
     private Optional<Boolean> useVespaVersionInRequest = Optional.empty();
     private Optional<Boolean> hostedVespa = Optional.empty();
+    private String zooKeeperSnapshotMethod = "gz";
 
     @Override
     public Optional<Integer> rpcPort() {
@@ -106,6 +108,9 @@ public class TestOptions implements CloudConfigOptions {
         return Optional.empty();
     }
 
+    @Override
+    public String zooKeeperSnapshotMethod() { return zooKeeperSnapshotMethod; }
+
     public TestOptions configServers(ConfigServer[] configServers) {
         this.configServers = configServers;
         return this;
@@ -131,4 +136,10 @@ public class TestOptions implements CloudConfigOptions {
         return this;
     }
 
+    public TestOptions zooKeeperSnapshotMethod(String snapshotMethod) {
+        Objects.requireNonNull(snapshotMethod);
+        this.zooKeeperSnapshotMethod = snapshotMethod;
+        return this;
+    }
+
 }
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 59c9ef994ab..93cf9c7c564 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -370,7 +370,13 @@ public class Flags {
             "Specifies which public key to use for core dump encryption.",
             "Takes effect on the next tick.",
             ZONE_ID, NODE_TYPE, HOSTNAME);
-    
+
+    public static final UnboundStringFlag ZOOKEEPER_SNAPSHOT_METHOD = defineStringFlag(
+            "zookeeper-snapshot-method", "gz",
+            List.of("mpolden"), "2023-02-01", "2023-05-01",
+            "ZooKeeper snapshot compression method. Valid values are '', 'gz' and 'snappy'",
+            "Takes effect on node restart");
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
                                                        String createdAt, String expiresAt, String description,
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
index 5560a633f66..74aacceaf9e 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
@@ -126,6 +126,12 @@ public class CloudConfigInstallVariables implements CloudConfigOptions {
         return getInstallVariable("zts_url");
     }
 
+    @Override
+    public String zooKeeperSnapshotMethod() {
+        String vespaZookeeperSnapshotMethod = System.getenv("VESPA_ZOOKEEPER_SNAPSHOT_METHOD");
+        return vespaZookeeperSnapshotMethod == null ? "" : vespaZookeeperSnapshotMethod;
+    }
+
     static ConfigServer[] toConfigServers(String configserversString) {
         return multiValueParameterStream(configserversString)
                 .map(CloudConfigInstallVariables::toConfigServer)