Revert "Scale threadpools with number of CPUs for non-hosted Vespa"

This reverts commit 67cb644b66d41723972deb2d971d375fa5308c78.

1 files changed, 15 insertions, 3 deletions

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 96029f809ae..a2887ae76c1 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
@@ -239,15 +239,27 @@ public class ContainerClusterTest {
     }
 
     @Test
-    public void requireThatNonHostedUsesLargerDefaultThreadpool() {
+    public void requireThatPoolAndQueueCanNotBeControlledByPropertiesWhenNoFlavor() {
         MockRoot root = new MockRoot("foo");
         ApplicationContainerCluster cluster = createContainerCluster(root, false);
         addContainer(root, cluster, "c1", "host-c1");
         root.freezeModelTopology();
 
         ThreadpoolConfig threadpoolConfig = root.getConfig(ThreadpoolConfig.class, "container0/component/default-threadpool");
-        assertEquals(-4, threadpoolConfig.maxthreads());
-        assertEquals(-40, threadpoolConfig.queueSize());
+        assertEquals(500, threadpoolConfig.maxthreads());
+        assertEquals(0, threadpoolConfig.queueSize());
+    }
+
+    @Test
+    public void requireThatDefaultThreadPoolConfigIsSane() {
+        MockRoot root = new MockRoot("foo");
+        ApplicationContainerCluster cluster = createContainerCluster(root, false);
+        addContainer(root, cluster, "c1", "host-c1");
+        root.freezeModelTopology();
+
+        ThreadpoolConfig threadpoolConfig = root.getConfig(ThreadpoolConfig.class, "container0/component/default-threadpool");
+        assertEquals(500, threadpoolConfig.maxthreads());
+        assertEquals(0, threadpoolConfig.queueSize());
     }
 
     @Test