diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-28 18:26:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-28 18:26:05 +0000 |
commit | 53a59a382628a13faa2fbd953fa6c408d59d957d (patch) | |
tree | d1c7f8d3242dcb7a3c9467edcfb4b4d261fadca2 /config-model | |
parent | 7e2354adb3fdfbc92fdfc7049e6d9f084ff2f1b8 (diff) |
Reduce threadpool for metrics proxy to 4.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/DefaultThreadpoolProvider.java | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java index 5074f1ecbbe..911e5e2e9bd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerThreadpool.java @@ -22,8 +22,6 @@ public class ContainerThreadpool extends SimpleComponent implements ContainerThr private final String name; private final UserOptions userOptions; - public ContainerThreadpool(String name) { this(name, null); } - public ContainerThreadpool(String name, UserOptions userOptions) { super(new ComponentModel( BundleInstantiationSpecification.getFromStrings( 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 2ca97b297b0..3dae3160c51 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 @@ -5,6 +5,7 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.container.handler.ThreadPoolProvider; import com.yahoo.container.handler.ThreadpoolConfig; import com.yahoo.osgi.provider.model.ComponentModel; +import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster; import com.yahoo.vespa.model.container.component.SimpleComponent; /** @@ -25,11 +26,18 @@ class DefaultThreadpoolProvider extends SimpleComponent implements ThreadpoolCon this.cluster = cluster; } + private int defaultThreadsByClusterType() { + if (cluster instanceof MetricsProxyContainerCluster) { + return 4; + } + return 10; + } + @Override public void getConfig(ThreadpoolConfig.Builder builder) { if (!(cluster instanceof ApplicationContainerCluster)) { // Container clusters such as logserver, metricsproxy and clustercontroller - int defaultWorkerThreads = 10; + int defaultWorkerThreads = defaultThreadsByClusterType(); builder.maxthreads(defaultWorkerThreads); builder.corePoolSize(defaultWorkerThreads); builder.queueSize(50); |