diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-12 21:03:17 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-12 21:03:17 +0200 |
commit | 49e0d50137c4e6294fc52dca3828077aea960212 (patch) | |
tree | 1a32163649c01aba150e85c7ae12bdabb03b0d91 | |
parent | c72c72e4918a08b7bbea863225bf32058d3080ea (diff) |
Make 2 cores available to the clustercontroller. Control all settings related to heap size.
4 files changed, 11 insertions, 6 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..caa62dbbec4 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,9 @@ 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); + builder.jvm.verbosegc(false); } } 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..74b28b3cfb9 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,9 @@ 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); + builder.jvm.heapSizeAsPercentageOfPhysicalMemory(0); + builder.jvm.heapsize(512); } @Override diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java index 68099f670d7..7cdeeac57ef 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java @@ -359,9 +359,9 @@ public class ClusterControllerTestCase extends DomBuilderTest { QrStartConfig qrStartConfig = new QrStartConfig(qrBuilder); assertEquals(512, qrStartConfig.jvm().heapsize()); assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); - assertEquals(0, qrStartConfig.jvm().availableProcessors()); - assertEquals(true, qrStartConfig.jvm().verbosegc()); - assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1", qrStartConfig.jvm().gcopts()); + assertEquals(2, qrStartConfig.jvm().availableProcessors()); + assertEquals(false, qrStartConfig.jvm().verbosegc()); + assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15", qrStartConfig.jvm().gcopts()); assertEquals(512, qrStartConfig.jvm().stacksize()); assertEquals(0, qrStartConfig.jvm().directMemorySizeCache()); assertEquals(75, qrStartConfig.jvm().baseMaxDirectMemorySize()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java index e3e256853b1..2e13ae3b66e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java @@ -63,9 +63,9 @@ public class MetricsProxyContainerTest { QrStartConfig.Builder qrBuilder = new QrStartConfig.Builder(); model.getConfig(qrBuilder, CONTAINER_CONFIG_ID); QrStartConfig qrStartConfig = new QrStartConfig(qrBuilder); - assertEquals(1536, qrStartConfig.jvm().heapsize()); + assertEquals(512, qrStartConfig.jvm().heapsize()); assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); - assertEquals(0, qrStartConfig.jvm().availableProcessors()); + assertEquals(2, qrStartConfig.jvm().availableProcessors()); assertEquals(false, qrStartConfig.jvm().verbosegc()); assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15", qrStartConfig.jvm().gcopts()); assertEquals(512, qrStartConfig.jvm().stacksize()); |