diff options
3 files changed, 0 insertions, 20 deletions
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 8c1450d9111..fff1e162a6c 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 @@ -31,12 +31,10 @@ public interface CloudConfigOptions { Optional<Long> zookeeperBarrierTimeout(); //in seconds Optional<Integer> zookeeperElectionPort(); Optional<Integer> zookeeperQuorumPort(); - 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(); // 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/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java index 8064c093e95..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 @@ -82,9 +82,6 @@ public class TestOptions implements CloudConfigOptions { } @Override - public Optional<String> payloadCompressionType() { return Optional.empty(); } - - @Override public Optional<String> environment() { return environment; } @Override @@ -97,9 +94,6 @@ public class TestOptions implements CloudConfigOptions { public Optional<Boolean> useVespaVersionInRequest() { return useVespaVersionInRequest; } @Override - public Optional<Integer> numParallelTenantLoaders() { return Optional.of(4); } - - @Override public Optional<String> loadBalancerAddress() { return Optional.empty(); } @Override 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 3d3197ddd1c..0095092c018 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 @@ -74,12 +74,6 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { return getInstallVariable("zookeeper_electionPort", Integer::parseInt); } - // TODO: Remove when 7.146 is the oldest version in use - @Override - public Optional<String> payloadCompressionType() { - return getInstallVariable("payload_compression_type", Function.identity()); - } - @Override public Optional<String> environment() { return Optional.ofNullable(System.getenv("VESPA_ENVIRONMENT")) @@ -108,12 +102,6 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { return getInstallVariable("hosted_vespa", Boolean::parseBoolean); } - // TODO: Remove when 7.146 is the oldest version in use - @Override - public Optional<Integer> numParallelTenantLoaders() { - return getInstallVariable("num_parallel_tenant_loaders", Integer::parseInt); - } - @Override public Optional<String> loadBalancerAddress() { return getInstallVariable("load_balancer_address"); |