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 /config-model/src/main | |
parent | 4d1754c799bc15e1851466f79672db0e77d9aff8 (diff) |
Revert "Scale threadpools with number of CPUs for non-hosted Vespa"
This reverts commit 67cb644b66d41723972deb2d971d375fa5308c78.
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java | 7 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java | 2 |
2 files changed, 3 insertions, 6 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); } } |