summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-10-15 16:49:12 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-10-15 16:49:12 +0200
commit4f4aac1af015a49755600c9a7dad95c0b4575928 (patch)
treecee12d8fe1fd293288f79edc55865888421be7d3 /config-model
parentaf9b71c51a175a26f003cdcce19583db024a824b (diff)
Reduce minimum threadpool size to 8
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/xml/SearchHandler.java2
2 files changed, 2 insertions, 2 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 17040caf5c2..1ebd62d6479 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
@@ -44,7 +44,7 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon
if (threadPoolSizeFactor <= 0 || vcpu == 0) return;
// Configuration is currently identical to the search handler's threadpool
- int workerThreads = Math.max(16, (int)Math.ceil(vcpu * threadPoolSizeFactor)); // TODO(bjorncs): reduce minimum size
+ int workerThreads = Math.max(8, (int)Math.ceil(vcpu * threadPoolSizeFactor));
builder.maxthreads(workerThreads);
builder.corePoolSize(workerThreads);
builder.queueSize((int)(workerThreads * deployState.getProperties().queueSizeFactor()));
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 8438214f1fd..473cfa05e64 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
@@ -64,7 +64,7 @@ class SearchHandler extends ProcessingHandler<SearchChains> {
builder.queueSize(0);
} else {
// Controls max number of concurrent requests per container
- int workerThreads = Math.max(16, (int)Math.ceil(vcpu * threadPoolSizeFactor)); // TODO(bjorncs): reduce minimum size
+ int workerThreads = Math.max(8, (int)Math.ceil(vcpu * threadPoolSizeFactor));
builder.maxThreads(workerThreads);
builder.minThreads(workerThreads);