diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-15 11:49:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-15 11:49:23 +0200 |
commit | a087d4ab10da1f8a052b63ae32dc8e340f27bc77 (patch) | |
tree | 652f59ed8bf5fb136d00bdd3f1617ac425bcf9d5 /config-model/src | |
parent | 38299f5fc89504356b9237d36e6dc55877d5ef1a (diff) | |
parent | 655f4721201b6c9c1eddbbf9eadb20ff71adb5f6 (diff) |
Merge pull request #10980 from vespa-engine/balder/expose-minheapsize-programatically
Add minheapsize as a controllable entity. Control it explicit and avo…
Diffstat (limited to 'config-model/src')
9 files changed, 6 insertions, 14 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java index 2a0cfadbfa8..e94fa9bf040 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java @@ -15,7 +15,6 @@ public class LogserverContainer extends Container { public LogserverContainer(AbstractConfigProducer parent) { super(parent, "" + 0, 0); addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, ((LogserverContainerCluster) parent).getName(), true)); - appendJvmOptions("-Xms32m"); } @Override diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java index 97579958d7b..c0dc029e009 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java @@ -48,8 +48,6 @@ public class MetricsProxyContainer extends Container implements setProp("clustertype", "admin"); setProp("index", String.valueOf(index)); addNodeSpecificComponents(); - - appendJvmOptions("-Xms32m"); } private void addNodeSpecificComponents() { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 10536147419..922c6488659 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -196,6 +196,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat super.getConfig(builder); builder.jvm.verbosegc(true) .availableProcessors(0) + .minHeapsize(1536) .heapsize(1536); if (getMemoryPercentage().isPresent()) { builder.jvm.heapSizeAsPercentageOfPhysicalMemory(getMemoryPercentage().get()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index fd14625953c..e4f5791b6b3 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -486,6 +486,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> builder.jvm .verbosegc(false) .availableProcessors(2) + .minHeapsize(32) .heapsize(512) .heapSizeAsPercentageOfPhysicalMemory(0) .gcopts(Objects.requireNonNullElse(jvmGCOptions, G1GC)); 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 6b7088a6074..f9c7a96737f 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 @@ -371,6 +371,7 @@ public class ClusterControllerTestCase extends DomBuilderTest { QrStartConfig.Builder qrBuilder = new QrStartConfig.Builder(); model.getConfig(qrBuilder, "admin/cluster-controllers/0/components/clustercontroller-bar-configurer"); QrStartConfig qrStartConfig = new QrStartConfig(qrBuilder); + assertEquals(32, qrStartConfig.jvm().minHeapsize()); assertEquals(512, qrStartConfig.jvm().heapsize()); assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); assertEquals(2, qrStartConfig.jvm().availableProcessors()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index 737e7b197bf..a96e462ccac 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -97,6 +97,7 @@ public class MetricsProxyContainerClusterTest { private void metrics_proxy_has_expected_qr_start_options(MetricsProxyModelTester.TestMode mode) { VespaModel model = getModel(servicesWithAdminOnly(), mode); QrStartConfig qrStartConfig = getQrStartConfig(model); + assertEquals(32, qrStartConfig.jvm().minHeapsize()); assertEquals(512, qrStartConfig.jvm().heapsize()); assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); assertEquals(2, qrStartConfig.jvm().availableProcessors()); 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 6802c47787a..80b4680ea82 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 @@ -50,17 +50,6 @@ public class MetricsProxyContainerTest { } } - private void metrics_proxy_requires_less_memory_than_other_containers(MetricsProxyModelTester.TestMode mode) { - VespaModel model = getModel(servicesWithContent(), mode); - MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(configId(model, mode)); - assertThat(container.getStartupCommand(), containsString("-Xms32m")); - } - @Test - public void metrics_proxy_requires_less_memory_than_other_containers() { - metrics_proxy_requires_less_memory_than_other_containers(self_hosted); - metrics_proxy_requires_less_memory_than_other_containers(hosted); - } - @Test public void http_server_is_running_on_expected_port() { VespaModel model = getModel(servicesWithContent(), self_hosted); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 695e82daf0b..956a4046205 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -154,6 +154,7 @@ public class ContainerClusterTest { QrStartConfig.Builder qrBuilder = new QrStartConfig.Builder(); cluster.getConfig(qrBuilder); QrStartConfig qrStartConfig = new QrStartConfig(qrBuilder); + assertEquals(32, qrStartConfig.jvm().minHeapsize()); assertEquals(512, qrStartConfig.jvm().heapsize()); assertEquals(0, qrStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java index 1456e632897..9ecd33f4273 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java @@ -218,6 +218,7 @@ public class DocprocBuilderTest extends DomBuilderTest { assertThat(jvm.server(), is(true)); assertThat(jvm.verbosegc(), is(true)); assertThat(jvm.gcopts(), is("-XX:+UseG1GC -XX:MaxTenuringThreshold=15")); + assertThat(jvm.minHeapsize(), is(1536)); assertThat(jvm.heapsize(), is(1536)); assertThat(jvm.stacksize(), is(512)); assertThat(qrStartConfig.ulimitv(), is("")); |