Remove feature flags for feed/search/defalt threadpool scaling

9 files changed, 15 insertions, 84 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 ce944b4c94d..fa4fee417fd 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
@@ -70,10 +70,10 @@ public interface ModelContext {
         default int defaultNumResponseThreads() { return 2; }
 
         // TODO(bjorncs) Temporary feature flag
-        double threadPoolSizeFactor();
+        default double threadPoolSizeFactor() { return 2.0; }
 
         // TODO(bjorncs) Temporary feature flag
-        double queueSizeFactor();
+        default double queueSizeFactor() { return 40.0; };
 
         /// Default setting for the gc-options attribute if not specified explicit by application
         String jvmGCOptions();
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 e141826ba44..7628af85b52 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
@@ -72,12 +72,6 @@ public class TestProperties implements ModelContext.Properties {
     @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; }
     @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
-    @Override public double threadPoolSizeFactor() {
-        return threadPoolSizeFactor;
-    }
-    @Override public double queueSizeFactor() {
-        return queueSizeFactor;
-    }
     @Override public boolean useContentNodeBtreeDb() { return useContentNodeBtreeDb; }
     @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; }
     @Override public boolean useDirectStorageApiRpc() { return useDirectStorageApiRpc; }
@@ -137,16 +131,6 @@ public class TestProperties implements ModelContext.Properties {
         return this;
     }
 
-    public TestProperties setThreadPoolSizeFactor(double threadPoolSizeFactor) {
-        this.threadPoolSizeFactor = threadPoolSizeFactor;
-        return this;
-    }
-
-    public TestProperties setQueueSizeFactor(double queueSizeFactor) {
-        this.queueSizeFactor = queueSizeFactor;
-        return this;
-    }
-
     public TestProperties setJettyThreadpoolSizeFactor(double factor) { this.jettyThreadpoolSizeFactor = factor; return this; }
 
     public TestProperties setApplicationId(ApplicationId applicationId) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
index e75ea26d065..c6f035b2885 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java
@@ -34,7 +34,7 @@ public class ContainerDocumentApi {
                 "com.yahoo.vespa.http.server.FeedHandler", bindingSuffix, options);
         cluster.addComponent(handler);
         var executor = new Threadpool(
-                "feedapi-handler", cluster, options.feedApiThreadpoolOptions, options.feedThreadPoolSizeFactor);
+                "feedapi-handler", cluster, options.feedApiThreadpoolOptions);
         handler.inject(executor);
         handler.addComponent(executor);
     }
@@ -48,7 +48,7 @@ public class ContainerDocumentApi {
         String bindingSuffix = "/document/v1/*";
         var oldHandler = newVespaClientHandler(oldHandlerName, options.useNewRestapiHandler ? null : bindingSuffix, options);
         cluster.addComponent(oldHandler);
-        var executor = new Threadpool("restapi-handler", cluster, options.restApiThreadpoolOptions, options.feedThreadPoolSizeFactor);
+        var executor = new Threadpool("restapi-handler", cluster, options.restApiThreadpoolOptions);
         oldHandler.inject(executor);
         oldHandler.addComponent(executor);
 
@@ -85,18 +85,15 @@ public class ContainerDocumentApi {
         private final Collection<String> bindings;
         private final ContainerThreadpool.UserOptions restApiThreadpoolOptions;
         private final ContainerThreadpool.UserOptions feedApiThreadpoolOptions;
-        private final double feedThreadPoolSizeFactor;
         private final boolean useNewRestapiHandler;
 
         public Options(Collection<String> bindings,
                        ContainerThreadpool.UserOptions restApiThreadpoolOptions,
                        ContainerThreadpool.UserOptions feedApiThreadpoolOptions,
-                       double feedThreadPoolSizeFactor,
                        boolean useNewRestapiHandler) {
             this.bindings = Collections.unmodifiableCollection(bindings);
             this.restApiThreadpoolOptions = restApiThreadpoolOptions;
             this.feedApiThreadpoolOptions = feedApiThreadpoolOptions;
-            this.feedThreadPoolSizeFactor = feedThreadPoolSizeFactor;
             this.useNewRestapiHandler = useNewRestapiHandler;
         }
     }
@@ -104,15 +101,12 @@ public class ContainerDocumentApi {
     private static class Threadpool extends ContainerThreadpool {
 
         private final ContainerCluster<?> cluster;
-        private final double feedThreadPoolSizeFactor;
 
         Threadpool(String name,
                    ContainerCluster<?> cluster,
-                   ContainerThreadpool.UserOptions threadpoolOptions,
-                   double feedThreadPoolSizeFactor ) {
+                   ContainerThreadpool.UserOptions threadpoolOptions) {
             super(name, threadpoolOptions);
             this.cluster = cluster;
-            this.feedThreadPoolSizeFactor = feedThreadPoolSizeFactor;
         }
 
         @Override
@@ -130,13 +124,13 @@ public class ContainerDocumentApi {
         private int maxPoolSize() {
             double vcpu = cluster.vcpu().orElse(0);
             if (vcpu == 0) return FALLBACK_MAX_POOL_SIZE;
-            return Math.max(2, (int)Math.ceil(vcpu * feedThreadPoolSizeFactor));
+            return Math.max(2, (int)Math.ceil(vcpu * 4.0));
         }
 
         private int minPoolSize() {
             double vcpu = cluster.vcpu().orElse(0);
             if (vcpu == 0) return FALLBACK_CORE_POOL_SIZE;
-            return Math.max(1, (int)Math.ceil(vcpu * feedThreadPoolSizeFactor * 0.5));
+            return Math.max(1, (int)Math.ceil(vcpu * 2.0));
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java
index 2db567b1460..344424ca8bf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java
@@ -39,14 +39,13 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon
             return;
         }
 
-        double threadPoolSizeFactor = deployState.getProperties().threadPoolSizeFactor();
         double vcpu = cluster.vcpu().orElse(0);
-        if (threadPoolSizeFactor <= 0 || vcpu == 0) return;
+        if (vcpu == 0) return;
 
         // Configuration is currently identical to the search handler's threadpool
-        int workerThreads = Math.max(8, (int)Math.ceil(vcpu * threadPoolSizeFactor));
+        int workerThreads = Math.max(8, (int)Math.ceil(vcpu * 2.0));
         builder.maxthreads(workerThreads);
         builder.corePoolSize(workerThreads);
-        builder.queueSize((int)(workerThreads * deployState.getProperties().queueSizeFactor()));
+        builder.queueSize((int)(workerThreads * 40.0));
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
index 3baf792dfba..2a64a194d37 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/DocumentApiOptionsBuilder.java
@@ -25,7 +25,6 @@ public class DocumentApiOptionsBuilder {
                 getBindings(spec),
                 threadpoolOptions(spec, "rest-api"),
                 threadpoolOptions(spec, "http-client-api"),
-                deployState.getProperties().feedCoreThreadPoolSizeFactor(),
                 deployState.getProperties().useNewRestapiHandler());
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
index ff6fd48c06a..3838dbae97a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java
@@ -56,22 +56,21 @@ class SearchHandler extends ProcessingHandler<SearchChains> {
             // User options overrides below configuration
             if (hasUserOptions()) return;
 
-            double threadPoolSizeFactor = deployState.getProperties().threadPoolSizeFactor();
             double vcpu = cluster.vcpu().orElse(0);
-            if (threadPoolSizeFactor <= 0 || vcpu == 0) {
+            if (vcpu == 0) {
                 builder.maxThreads(500);
                 builder.minThreads(500);
                 builder.queueSize(0);
             } else {
                 // Controls max number of concurrent requests per container
-                int workerThreads = Math.max(8, (int)Math.ceil(vcpu * threadPoolSizeFactor));
+                int workerThreads = Math.max(8, (int)Math.ceil(vcpu * 2.0));
                 builder.maxThreads(workerThreads);
                 builder.minThreads(workerThreads);
 
                 // This controls your burst handling capability.
                 // 0 => No extra burst handling beyond you max concurrent requests (maxthreads).
                 // N => N times max concurrent requests as a buffer for handling bursts
-                builder.queueSize((int)(workerThreads * deployState.getProperties().queueSizeFactor()));
+                builder.queueSize((int)(workerThreads * 40.0));
             }
         }
 
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 e5b2cc7e220..3da872c2f70 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
@@ -216,11 +216,7 @@ public class ContainerClusterTest {
 
     @Test
     public void requireThatPoolAndQueueCanNotBeControlledByPropertiesWhenNoFlavor() {
-        DeployState state = new DeployState.Builder().properties(new TestProperties()
-                    .setThreadPoolSizeFactor(8.5)
-                    .setQueueSizeFactor(13.3))
-                .build();
-        MockRoot root = new MockRoot("foo", state);
+        MockRoot root = new MockRoot("foo");
         ApplicationContainerCluster cluster = createContainerCluster(root, false);
         addContainer(root.deployLogger(), cluster, "c1", "host-c1");
         root.freezeModelTopology();
@@ -262,9 +258,6 @@ public class ContainerClusterTest {
         MockRoot root = new MockRoot(
                 "foo",
                 new DeployState.Builder()
-                        .properties(new TestProperties()
-                                .setThreadPoolSizeFactor(4)
-                                .setQueueSizeFactor(20))
                         .applicationPackage(new MockApplicationPackage.Builder().build())
                         .modelHostProvisioner(hostProvisioner)
                         .build());
@@ -276,7 +269,7 @@ public class ContainerClusterTest {
         root.freezeModelTopology();
 
         ThreadpoolConfig threadpoolConfig = root.getConfig(ThreadpoolConfig.class, "container0/component/default-threadpool");
-        assertEquals(16, threadpoolConfig.maxthreads());
+        assertEquals(8, threadpoolConfig.maxthreads());
         assertEquals(320, threadpoolConfig.queueSize());
     }
 
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 8963fbf8cdf..95b9ac433cf 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
@@ -153,8 +153,6 @@ public class ModelContextImpl implements ModelContext {
         private final boolean useFastValueTensorImplementation;
         private final Optional<EndpointCertificateSecrets> endpointCertificateSecrets;
         private final double defaultTermwiseLimit;
-        private final double threadPoolSizeFactor;
-        private final double queueSizefactor;
         private final String jvmGCOPtions;
         private final String feedSequencer;
         private final String responseSequencer;
@@ -164,7 +162,6 @@ public class ModelContextImpl implements ModelContext {
         private final boolean skipMbusReplyThread;
         private final Optional<AthenzDomain> athenzDomain;
         private final Optional<ApplicationRoles> applicationRoles;
-        private final double feedCoreThreadPoolSizeFactor;
         private final double visibilityDelay;
         private final Quota quota;
         private final boolean tlsUseFSync;
@@ -211,16 +208,12 @@ public class ModelContextImpl implements ModelContext {
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             useFastValueTensorImplementation = Flags.USE_FAST_VALUE_TENSOR_IMPLEMENTATION.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
-            threadPoolSizeFactor = Flags.DEFAULT_THREADPOOL_SIZE_FACTOR.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             visibilityDelay = Flags.VISIBILITY_DELAY.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             tlsCompressionType = Flags.TLS_COMPRESSION_TYPE.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             tlsUseFSync = Flags.TLS_USE_FSYNC.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
-            queueSizefactor = Flags.DEFAULT_QUEUE_SIZE_FACTOR.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             jvmGCOPtions = Flags.JVM_GC_OPTIONS.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             feedSequencer = Flags.FEED_SEQUENCER_TYPE.bindTo(flagSource)
@@ -237,8 +230,6 @@ public class ModelContextImpl implements ModelContext {
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.athenzDomain = athenzDomain;
             this.applicationRoles = applicationRoles;
-            feedCoreThreadPoolSizeFactor = Flags.FEED_CORE_THREAD_POOL_SIZE_FACTOR.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.quota = maybeQuota.orElseGet(Quota::unlimited);
             this.useNewRestapiHandler = Flags.USE_NEW_RESTAPI_HANDLER.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm())
@@ -296,16 +287,6 @@ public class ModelContextImpl implements ModelContext {
         public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
 
         @Override
-        public double threadPoolSizeFactor() {
-            return threadPoolSizeFactor;
-        }
-
-        @Override
-        public double queueSizeFactor() {
-            return queueSizefactor;
-        }
-
-        @Override
         public boolean useContentNodeBtreeDb() {
             return useContentNodeBtreeDb;
         }
@@ -342,7 +323,6 @@ public class ModelContextImpl implements ModelContext {
         @Override public boolean skipCommunicationManagerThread() { return skipCommunicationManagerThread; }
         @Override public boolean skipMbusRequestThread() { return skipMbusRequestThread; }
         @Override public boolean skipMbusReplyThread() { return skipMbusReplyThread; }
-        @Override public double feedCoreThreadPoolSizeFactor() { return feedCoreThreadPoolSizeFactor; }
         @Override public double visibilityDelay() { return visibilityDelay; }
         @Override public boolean tlsUseFSync() { return tlsUseFSync; }
         @Override public String tlsCompressionType() { return tlsCompressionType; }
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 ecf95717624..2d5b6d33714 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -107,17 +107,6 @@ public class Flags {
             "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",
-            "Takes effect at redeployment",
-            ZONE_ID, APPLICATION_ID);
-    public static final UnboundDoubleFlag DEFAULT_QUEUE_SIZE_FACTOR = defineDoubleFlag(
-            "default-queue-size-factor", 0.0,
-            "Default multiplication factor when computing queuesize for burst handling",
-            "Takes effect at redeployment",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundStringFlag JVM_GC_OPTIONS = defineStringFlag(
             "jvm-gc-options", "",
             "Sets deafult jvm gc options",
@@ -322,12 +311,6 @@ public class Flags {
             "Takes effect on next tick"
     );
 
-    public static final UnboundDoubleFlag FEED_CORE_THREAD_POOL_SIZE_FACTOR = defineDoubleFlag(
-            "feed-core-thread-pool-size-factor", 4.0,
-            "Max threads in threadpool for feeding APIs as a factor of vcpu",
-            "Takes effect on next internal redeployment",
-            APPLICATION_ID);
-
     public static final UnboundBooleanFlag HIDE_SHARED_ROUTING_ENDPOINT = defineFeatureFlag(
             "hide-shared-routing-endpoint",
             false,