diff options
7 files changed, 4 insertions, 48 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 2911eae8d83..e465f97ae4c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -79,10 +79,10 @@ public interface ModelContext { // TODO Revisit in May or June 2020 double queueSizeFactor(); - // TODO Revisit in May or June 2020 - double defaultSoftStartSeconds(); + // TODO Remove when 7.229 is last + default double defaultSoftStartSeconds() { return 0; } - // TODO Remove when 7.225 is last + // TODO Remove when 7.226 is last default double defaultTopKProbability() { return 0.9999; } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index b06022ba714..16d1261b8d6 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -40,7 +40,6 @@ public class TestProperties implements ModelContext.Properties { private boolean useDistributorBtreeDb = false; private boolean useThreePhaseUpdates = false; private double defaultTermwiseLimit = 1.0; - private double softStartSeconds = 0.0; private double threadPoolSizeFactor = 0.0; private double queueSizeFactor = 0.0; private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty(); @@ -73,11 +72,6 @@ public class TestProperties implements ModelContext.Properties { return queueSizeFactor; } - @Override - public double defaultSoftStartSeconds() { - return softStartSeconds; - } - @Override public boolean useDistributorBtreeDb() { return useDistributorBtreeDb; } @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; } @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); } @@ -98,10 +92,6 @@ public class TestProperties implements ModelContext.Properties { return this; } - public TestProperties setSoftStartSeconds(double softStartSeconds) { - this.softStartSeconds = softStartSeconds; - return this; - } public TestProperties setThreadPoolSizeFactor(double threadPoolSizeFactor) { this.threadPoolSizeFactor = threadPoolSizeFactor; return this; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 37548a15835..56e0bd579cb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -69,7 +69,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat private MbusParams mbusParams; private boolean messageBusEnabled = true; - private final double softStartSeconds; private Integer memoryPercentage = null; @@ -87,7 +86,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addSimpleComponent("ai.vespa.cloud.SystemInfo"); addMetricsV2Handler(); addTestrunnerComponentsIfTester(deployState); - softStartSeconds = deployState.getProperties().defaultSoftStartSeconds(); } @Override @@ -254,7 +252,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat @Override public void getConfig(ThreadpoolConfig.Builder builder) { - builder.softStartSeconds(softStartSeconds); } public static class MbusParams { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 9a59907a230..ceef0ccf1e2 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -206,22 +206,6 @@ public class ContainerClusterTest { } @Test - public void requireThatSoftStartSecondsCanBeControlledByProperties() { - DeployState state = new DeployState.Builder().properties(new TestProperties().setSoftStartSeconds(300.0)) - .build(); - MockRoot root = new MockRoot("foo", state); - ApplicationContainerCluster cluster = createContainerCluster(root, false); - addContainer(root.deployLogger(), cluster, "c1", "host-c1"); - - ThreadpoolConfig.Builder tpBuilder = new ThreadpoolConfig.Builder(); - cluster.getConfig(tpBuilder); - ThreadpoolConfig threadpoolConfig = new ThreadpoolConfig(tpBuilder); - assertEquals(500, threadpoolConfig.maxthreads()); - assertEquals(0, threadpoolConfig.queueSize()); - assertEquals(300.0, threadpoolConfig.softStartSeconds(), 0.0); - } - - @Test public void requireThatPoolAndQueueCanNotBeControlledByPropertiesWhenNoFlavor() { DeployState state = new DeployState.Builder().properties(new TestProperties() .setThreadPoolSizeFactor(8.5) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 6d57239fc4a..288df341f2a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -151,7 +151,6 @@ public class ModelContextImpl implements ModelContext { private final boolean useThreePhaseUpdates; private final Optional<EndpointCertificateSecrets> endpointCertificateSecrets; private final double defaultTermwiseLimit; - private final double defaultSoftStartSeconds; private final double threadPoolSizeFactor; private final double queueSizefactor; private final Optional<AthenzDomain> athenzDomain; @@ -187,8 +186,6 @@ public class ModelContextImpl implements ModelContext { this.endpointCertificateSecrets = endpointCertificateSecrets; defaultTermwiseLimit = Flags.DEFAULT_TERM_WISE_LIMIT.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - defaultSoftStartSeconds = Flags.DEFAULT_SOFT_START_SECONDS.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); useDistributorBtreeDb = Flags.USE_DISTRIBUTOR_BTREE_DB.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); useThreePhaseUpdates = Flags.USE_THREE_PHASE_UPDATES.bindTo(flagSource) @@ -256,10 +253,6 @@ public class ModelContextImpl implements ModelContext { return queueSizefactor; } - public double defaultSoftStartSeconds() { - return defaultSoftStartSeconds; - } - @Override public boolean useDistributorBtreeDb() { return useDistributorBtreeDb; 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 386a169acb0..69931d4d5ba 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -135,11 +135,6 @@ public class Flags { "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); - public static final UnboundDoubleFlag DEFAULT_SOFT_START_SECONDS = defineDoubleFlag( - "default-soft-start-seconds", 0.0, - "Default number of seconds that a soft start shall use", - "Takes effect at redeployment", - ZONE_ID, APPLICATION_ID); public static final UnboundDoubleFlag DEFAULT_THREADPOOL_SIZE_FACTOR = defineDoubleFlag( "default-threadpool-size-factor", 0.0, "Default multiplication factor when computing maxthreads for main container threadpool based on available cores", diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java index ccd2d80efb2..cf33b6033cd 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java @@ -99,10 +99,7 @@ public class RestApi extends LoggingRequestHandler { } // For testing and development - public RestApi(Executor executor, - AccessLog accessLog, - OperationHandler operationHandler, - int threadsAvailable) { + RestApi(Executor executor, AccessLog accessLog, OperationHandler operationHandler, int threadsAvailable) { super(executor, accessLog, null); this.operationHandler = operationHandler; this.threadsAvailableForApi = new AtomicInteger(threadsAvailable); |