Remove control of slow start. That was a blind alley.

3 files changed, 0 insertions, 29 deletions

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)