diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-01 08:54:31 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-01 08:54:31 +0200 |
commit | e52639a7ae317d16a5e6513ef868829a2e10a20e (patch) | |
tree | a56c888acd99485f2b10a53bc6ff85ba09fde7c3 | |
parent | 4d1754c799bc15e1851466f79672db0e77d9aff8 (diff) |
Revert "Scale threadpools with number of CPUs for non-hosted Vespa"
This reverts commit 67cb644b66d41723972deb2d971d375fa5308c78.
4 files changed, 21 insertions, 12 deletions
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 3fde2167bf8..e74eac09558 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 @@ -46,10 +46,7 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon return; } - if (cluster.isHostedVespa()) { - builder.corePoolSize(-2).maxthreads(-2).queueSize(-40); - } else { - builder.corePoolSize(-4).maxthreads(-4).queueSize(-40); - } + if (!cluster.isHostedVespa()) return; + builder.corePoolSize(-2).maxthreads(-2).queueSize(-40); } } 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 0902fc454c3..d3001bd9100 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 @@ -51,7 +51,7 @@ class SearchHandler extends ProcessingHandler<SearchChains> { if (cluster.isHostedVespa()) { builder.maxThreads(-2).minThreads(-2).queueSize(-40); } else { - builder.maxThreads(-4).minThreads(-4).queueSize(-40); + builder.maxThreads(500).minThreads(500).queueSize(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 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 diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java index 83e338fcaf0..4c1fda44038 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java @@ -242,9 +242,9 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { ContainerThreadpoolConfig config = root.getConfig( ContainerThreadpoolConfig.class, "default/component/" + SearchHandler.HANDLER_CLASS + "/threadpool@search-handler"); - assertEquals(-4, config.maxThreads()); - assertEquals(-4, config.minThreads()); - assertEquals(-40, config.queueSize()); + assertEquals(500, config.maxThreads()); + assertEquals(500, config.minThreads()); + assertEquals(0, config.queueSize()); } @Test |