diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-01 11:12:03 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-01 11:15:00 +0200 |
| commit | b3701795d6ac79ff596b7d48ab9e88be1c07fe76 (patch) | |
| tree | a128c83f206b83384dee64db4e7ca4c6b346c189 /config-model/src/main/java/com | |
| parent | 4610d5c0e0b55c1fbf77b82f34f1d0b433c18ae6 (diff) | |
Scale threadpools with number of CPUs for non-hosted Vespa
Diffstat (limited to 'config-model/src/main/java/com')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java | 1 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java | 6 |
2 files changed, 1 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 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<SearchChains> { // 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); } |