Prepare for removing unused/unnecessary options payloadCompressionType and numParallelTenantLoaders

4 files changed, 4 insertions, 23 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 38a6070d357..233db8ecf7e 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
@@ -99,9 +99,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.multiTenant().isPresent()) {
             builder.multitenant(options.multiTenant().get());
         }
-        if (options.payloadCompressionType().isPresent()) {
-            builder.payloadCompressionType(ConfigserverConfig.PayloadCompressionType.Enum.valueOf(options.payloadCompressionType().get()));
-        }
         for (ConfigServer server : getConfigServers()) {
             ConfigserverConfig.Zookeeperserver.Builder zkBuilder = new ConfigserverConfig.Zookeeperserver.Builder();
             zkBuilder.hostname(server.hostName);
@@ -132,9 +129,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.hostedVespa().isPresent()) {
             builder.hostedVespa(options.hostedVespa().get());
         }
-        if (options.numParallelTenantLoaders().isPresent()) {
-            builder.numParallelTenantLoaders(options.numParallelTenantLoaders().get());
-        }
         if (options.loadBalancerAddress().isPresent()) {
             builder.loadBalancerAddress(options.loadBalancerAddress().get());
         }
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 2162550cadf..c3ed080fe3a 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
@@ -32,12 +32,12 @@ public interface CloudConfigOptions {
     Optional<Long> zookeeperBarrierTimeout(); //in seconds
     Optional<Integer> zookeeperElectionPort();
     Optional<Integer> zookeeperQuorumPort();
-    Optional<String> payloadCompressionType();
+    Optional<String> payloadCompressionType(); // TODO: Remove when 7.146 is the oldest version in use
     Optional<String> environment();
     Optional<String> region();
     Optional<String> system();
     Optional<Boolean> useVespaVersionInRequest();
-    Optional<Integer> numParallelTenantLoaders();
+    Optional<Integer> numParallelTenantLoaders(); // TODO: Remove when 7.146 is the oldest version in use
     Optional<String> loadBalancerAddress();
     Optional<String> athenzDnsSuffix();
     Optional<String> ztsUrl();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
index b4d889a4598..94f8d34e7c6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/ConfigserverClusterTest.java
@@ -113,7 +113,7 @@ public class ConfigserverClusterTest {
         assertThat(config.httpport(), is(1337));
         assertThat(config.serverId(), is(HostName.getLocalhost()));
         assertTrue(config.useVespaVersionInRequest());
-        assertThat(config.numParallelTenantLoaders(), is(99));
+        assertThat(config.numParallelTenantLoaders(), is(4));
         assertFalse(config.multitenant());
         assertTrue(config.hostedVespa());
         assertThat(config.environment(), is("test"));
@@ -138,8 +138,7 @@ public class ConfigserverClusterTest {
                 .useVespaVersionInRequest(true)
                 .hostedVespa(hostedVespa)
                 .environment("test")
-                .region("bar")
-                .numParallelTenantLoaders(99);
+                .region("bar");
 
         Optional.of(configServerHostnames)
                 .filter(hostnames -> !hostnames.isEmpty())
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 faa461e681b..8da7386e067 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
@@ -17,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 Optional<Integer> numParallelTenantLoaders = Optional.empty();
 
     @Override
     public Optional<Integer> rpcPort() {
@@ -83,9 +82,6 @@ public class TestOptions implements CloudConfigOptions {
     }
 
     @Override
-    public Optional<String> payloadCompressionType() { return Optional.empty(); }
-
-    @Override
     public Optional<String> environment() { return environment; }
 
     @Override
@@ -98,9 +94,6 @@ public class TestOptions implements CloudConfigOptions {
     public Optional<Boolean> useVespaVersionInRequest() { return useVespaVersionInRequest; }
 
     @Override
-    public Optional<Integer> numParallelTenantLoaders() { return numParallelTenantLoaders; }
-
-    @Override
     public Optional<String> loadBalancerAddress() { return Optional.empty(); }
 
     @Override
@@ -123,11 +116,6 @@ public class TestOptions implements CloudConfigOptions {
         return this;
     }
 
-    public TestOptions numParallelTenantLoaders(int numLoaders) {
-        this.numParallelTenantLoaders = Optional.of(numLoaders);
-        return this;
-    }
-
     public TestOptions environment(String environment) {
         this.environment = Optional.of(environment);
         return this;