From 9a4b0b11a9b168698f94e45a3023215dcdcd975f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 14 Jan 2022 21:50:30 +0100
Subject: All non application clusters only needs a few threads. 2 should be
 sufficient. This is controlled by the featureflag so far only used for the
 metrics-proxy. This will bring the clustercontroller and logserver in line
 with the metrics-proxy.

---
 .../java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java     | 2 +-
 .../admin/clustercontroller/ClusterControllerContainerCluster.java      | 2 +-
 .../vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
index 43f66f2c727..75b13a89e83 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java
@@ -17,7 +17,7 @@ import java.util.Optional;
 public class LogserverContainerCluster extends ContainerCluster<LogserverContainer> {
 
     public LogserverContainerCluster(AbstractConfigProducer<?> parent, String name, DeployState deployState) {
-        super(parent, name, name, deployState, true);
+        super(parent, name, name, deployState, true, deployState.featureFlags().defaultPoolNumThreads());
 
         addDefaultHandlersWithVip();
         addLogHandler();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index 728e46f2ff7..a7f3a6224f2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -22,7 +22,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
 
     public ClusterControllerContainerCluster(
             AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) {
-        super(parent, subId, name, deployState, false);
+        super(parent, subId, name, deployState, false, deployState.featureFlags().defaultPoolNumThreads());
         addDefaultHandlersWithVip();
         this.reindexingContext = createReindexingContext(deployState);
         setJvmGCOptions(deployState.getProperties().jvmGCOptions(Optional.of(ClusterSpec.Type.admin)));
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index dd6f77ed093..a29647b062a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -87,7 +87,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
     private final ApplicationId applicationId;
 
     public MetricsProxyContainerCluster(AbstractConfigProducer<?> parent, String name, DeployState deployState) {
-        super(parent, name, name, deployState, true);
+        super(parent, name, name, deployState, true, deployState.featureFlags().defaultPoolNumThreads());
         this.parent = parent;
         applicationId = deployState.getProperties().applicationId();
 
-- 
cgit v1.2.3