Use default value for ZooKeeper snapsthot method for config servers

Use default value from config definition

3 files changed, 0 insertions, 16 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 302e8eff2d8..413c6f07efd 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
@@ -83,8 +83,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.zookeeperClientPort().isPresent()) {
             builder.clientPort(options.zookeeperClientPort().get());
         }
-
-        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 c61c140c05b..5e7c22f8844 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
@@ -21,13 +21,11 @@ public interface CloudConfigOptions {
     Optional<Integer> rpcPort();
     Optional<Boolean> multiTenant();
     Optional<Boolean> hostedVespa();
-
     ConfigServer[] allConfigServers();
     int[] configServerZookeeperIds();
     Optional<Integer> zookeeperClientPort();
     String[] configModelPluginDirs();
     Optional<Long> sessionLifeTimeSecs();
-
     Optional<Long> zookeeperBarrierTimeout(); //in seconds
     Optional<Integer> zookeeperElectionPort();
     Optional<Integer> zookeeperQuorumPort();
@@ -38,5 +36,4 @@ 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 fc7f8674149..95c3262f2f5 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,7 +3,6 @@ package com.yahoo.vespa.model.container.configserver;
 
 import com.yahoo.vespa.model.container.configserver.option.CloudConfigOptions;
 
-import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -18,7 +17,6 @@ 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 = "";
 
     @Override
     public Optional<Integer> rpcPort() {
@@ -108,9 +106,6 @@ public class TestOptions implements CloudConfigOptions {
         return Optional.empty();
     }
 
-    @Override
-    public String zooKeeperSnapshotMethod() { return zooKeeperSnapshotMethod; }
-
     public TestOptions configServers(ConfigServer[] configServers) {
         this.configServers = configServers;
         return this;
@@ -136,10 +131,4 @@ public class TestOptions implements CloudConfigOptions {
         return this;
     }
 
-    public TestOptions zooKeeperSnapshotMethod(String snapshotMethod) {
-        Objects.requireNonNull(snapshotMethod);
-        this.zooKeeperSnapshotMethod = snapshotMethod;
-        return this;
-    }
-
 }