From be3ebf5afff58ab5b2a63dbc7645abed40147434 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Tue, 11 Jan 2022 07:43:41 +0100
Subject: Supprt configuring ZooKeeper snapshot method

---
 .../yahoo/vespa/model/container/configserver/ConfigserverCluster.java | 4 +++-
 .../vespa/model/container/configserver/option/CloudConfigOptions.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'config-model/src/main/java/com/yahoo')

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 8ac30f66ae7..302e8eff2d8 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
@@ -47,7 +47,7 @@ public class ConfigserverCluster extends AbstractConfigProducer
         this.containerCluster = containerCluster;
 
         // If we are in a config server cluster the correct zone is propagated through cloud config options,
-        // not through config to deployment options (see StandaloneContainerApplication.scala),
+        // not through config to deployment options (see StandaloneContainerApplication.java),
         // so we need to propagate the zone options into the container from here
         Environment environment = options.environment().isPresent() ? Environment.from(options.environment().get()) : Environment.defaultEnvironment();
         RegionName region = options.region().isPresent() ? RegionName.from(options.region().get()) : RegionName.defaultName();
@@ -83,6 +83,8 @@ 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 fe3bd271f2f..c61c140c05b 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
@@ -38,4 +38,5 @@ public interface CloudConfigOptions {
     Optional<String> loadBalancerAddress();
     Optional<String> athenzDnsSuffix();
     Optional<String> ztsUrl();
+    String zooKeeperSnapshotMethod();
 }
-- 
cgit v1.2.3