Change feature flag to no longer control the default threadpool

1 files changed, 5 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
index 5207a0163cb..232552ea4ce 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java
@@ -3,8 +3,8 @@ package com.yahoo.vespa.model.container;
 
 import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
+import com.yahoo.config.provision.NodeResources;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.prelude.fastsearch.FS4ResourcePool;
 import com.yahoo.search.config.QrStartConfig;
@@ -15,10 +15,7 @@ import com.yahoo.vespa.model.container.component.Component;
  *
  * @author gjoranv
  */
-public final class ApplicationContainer extends Container implements
-        QrStartConfig.Producer,
-        ThreadpoolConfig.Producer
-{
+public final class ApplicationContainer extends Container implements QrStartConfig.Producer {
 
     private static final String defaultHostedJVMArgs = "-XX:+UseOSErrorReporting -XX:+SuppressFatalErrorMessage";
 
@@ -44,9 +41,9 @@ public final class ApplicationContainer extends Container implements
     @Override
     public void getConfig(QrStartConfig.Builder builder) {
         if (getHostResource() != null) {
-            if ( ! getHostResource().realResources().isUnspecified()) {
-                NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().realResources());
-                flavorTuning.getConfig(builder);
+            NodeResources nodeResources = getHostResource().realResources();
+            if ( ! nodeResources.isUnspecified()) {
+                builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(nodeResources.vcpu())));
             }
         }
     }
@@ -75,17 +72,4 @@ public final class ApplicationContainer extends Container implements
     private boolean hasDocproc() {
         return (parent instanceof ContainerCluster) && (((ContainerCluster)parent).getDocproc() != null);
     }
-
-    @Override
-    public void getConfig(ThreadpoolConfig.Builder builder) {
-        if (! (parent instanceof ContainerCluster)) return;
-        if ((getHostResource() == null) || getHostResource().realResources().isUnspecified()) return;
-        ContainerCluster containerCluster = (ContainerCluster) parent;
-        if (containerCluster.getThreadPoolSizeFactor() <= 0.0) return;
-
-        NodeResourcesTuning resourcesTuning = new NodeResourcesTuning(getHostResource().realResources())
-                .setThreadPoolSizeFactor(containerCluster.getThreadPoolSizeFactor())
-                .setQueueSizeFactor(containerCluster.getQueueSizeFactor());
-        resourcesTuning.getConfig(builder);
-    }
 }