summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-08 13:13:44 +0200
committerGitHub <noreply@github.com>2019-10-08 13:13:44 +0200
commitf2cbeaa19aafacbf290b90b7b53b727c5fb2ae98 (patch)
treeb2d3a8b7ceeea4707217c2fc7931b92ddeaf1d90 /config-model
parent64d8a699b668a5ed1dae0b86bd88bd3a2b40e48c (diff)
parentf5ae2fc5940e4b8eccbf8bb85334783055a51d9f (diff)
Merge pull request #10915 from vespa-engine/balder/let-us-not-expose-more-resources-than-necessary
2 threads should be plenty here.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java3
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index d5e42276c1a..423d8384aa5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -110,7 +110,8 @@ public class ClusterControllerContainer extends Container implements
@Override
public void getConfig(QrStartConfig.Builder builder) {
- builder.jvm(new QrStartConfig.Jvm.Builder().heapsize(512));
+ builder.jvm.heapsize(512);
+ builder.jvm.availableProcessors(2);
}
}
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 253ad4ce119..2988ff9ecdc 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
@@ -155,6 +155,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
super.getConfig(builder);
// This takes effect via vespa-start-container-daemon:configure_gcopts
builder.jvm.verbosegc(false);
+ builder.jvm.availableProcessors(2);
}
@Override