From b3701795d6ac79ff596b7d48ab9e88be1c07fe76 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 1 Oct 2021 11:12:03 +0200 Subject: Scale threadpools with number of CPUs for non-hosted Vespa --- .../model/container/DefaultThreadpoolProvider.java | 1 - .../yahoo/vespa/model/container/xml/SearchHandler.java | 6 +----- .../vespa/model/container/ContainerClusterTest.java | 18 +++--------------- .../vespa/model/container/xml/SearchBuilderTest.java | 6 +++--- 4 files changed, 7 insertions(+), 24 deletions(-) (limited to 'config-model') 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 e74eac09558..8f6694e3e41 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,7 +46,6 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon return; } - 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 d3001bd9100..f95ddad96f7 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 @@ -48,11 +48,7 @@ class SearchHandler extends ProcessingHandler { // User options overrides below configuration if (hasUserOptions()) return; - if (cluster.isHostedVespa()) { - builder.maxThreads(-2).minThreads(-2).queueSize(-40); - } else { - builder.maxThreads(500).minThreads(500).queueSize(0); - } + builder.maxThreads(-2).minThreads(-2).queueSize(-40); } 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 a2887ae76c1..7b5efad9647 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,27 +239,15 @@ public class ContainerClusterTest { } @Test - public void requireThatPoolAndQueueCanNotBeControlledByPropertiesWhenNoFlavor() { + public void requireThatNonHostedUsesExpectedDefaultThreadpoolConfiguration() { 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 - 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()); + assertEquals(-2, threadpoolConfig.maxthreads()); + assertEquals(-40, 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 4c1fda44038..a0552880b8c 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(500, config.maxThreads()); - assertEquals(500, config.minThreads()); - assertEquals(0, config.queueSize()); + assertEquals(-2, config.maxThreads()); + assertEquals(-2, config.minThreads()); + assertEquals(-40, config.queueSize()); } @Test -- cgit v1.2.3