diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-28 18:09:16 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-28 18:09:16 +0000 |
commit | 0d2f83bd76f804fe916629eb714c93cef03f3db5 (patch) | |
tree | cf261a27abe7d2883c12d88c34746f55d15a1962 /config-model | |
parent | 7e2354adb3fdfbc92fdfc7049e6d9f084ff2f1b8 (diff) |
We only new a handfull of threads for the httpserver in the clustercontroller and metricsproxy.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java index 901c422f843..69c1f9ca10e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java @@ -7,6 +7,7 @@ import com.yahoo.config.model.api.ModelContext; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.ServerConfig; import com.yahoo.osgi.provider.model.ComponentModel; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.container.component.SimpleComponent; @@ -46,14 +47,6 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro addChild(connectorFactory); } - public void removeConnector(ConnectorFactory connectorFactory) { - if (connectorFactory == null) { - return; - } - removeChild(connectorFactory); - connectorFactories.remove(connectorFactory); - } - public List<ConnectorFactory> getConnectorFactories() { return Collections.unmodifiableList(connectorFactories); } @@ -82,10 +75,17 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro private void configureJettyThreadpool(ServerConfig.Builder builder) { if (cluster == null) return; + if (cluster instanceof ApplicationContainerCluster) { + configureApplicationClusterJettyThreadPool(builder); + } else { + builder.minWorkerThreads(2).maxWorkerThreads(4); + } + } + private void configureApplicationClusterJettyThreadPool(ServerConfig.Builder builder) { double vcpu = cluster.vcpu().orElse(0); if (vcpu > 0) { int threads = 16 + (int) Math.ceil(vcpu); - builder.maxWorkerThreads(threads).minWorkerThreads(threads); + builder.minWorkerThreads(threads).maxWorkerThreads(threads); } } |