summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-09-30 15:39:36 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-09-30 15:39:36 +0200
commit67cb644b66d41723972deb2d971d375fa5308c78 (patch)
treeb8f1b1de1aaef64f8f309c2ac8980e663fa10db4 /config-model/src/main/java/com
parent3027edb077b126b760f1d374a2b753ef69204973 (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.java7
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java2
2 files changed, 6 insertions, 3 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..3fde2167bf8 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,10 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon
return;
}
- if (!cluster.isHostedVespa()) return;
- builder.corePoolSize(-2).maxthreads(-2).queueSize(-40);
+ if (cluster.isHostedVespa()) {
+ builder.corePoolSize(-2).maxthreads(-2).queueSize(-40);
+ } else {
+ builder.corePoolSize(-4).maxthreads(-4).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..0902fc454c3 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(500).minThreads(500).queueSize(0);
+ builder.maxThreads(-4).minThreads(-4).queueSize(-40);
}
}