summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
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, 1 insertions, 3 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 423d8384aa5..d5e42276c1a 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,8 +110,7 @@ public class ClusterControllerContainer extends Container implements
@Override
public void getConfig(QrStartConfig.Builder builder) {
- builder.jvm.heapsize(512);
- builder.jvm.availableProcessors(2);
+ builder.jvm(new QrStartConfig.Jvm.Builder().heapsize(512));
}
}
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 2988ff9ecdc..253ad4ce119 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,7 +155,6 @@ 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