diff options
Diffstat (limited to 'config-model')
3 files changed, 14 insertions, 3 deletions
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 60f13ab6012..e683b70bbde 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 @@ -51,6 +51,8 @@ public class MetricsProxyContainer extends Container implements setProp("clustertype", "admin"); setProp("index", String.valueOf(index)); addNodeSpecificComponents(); + + appendJvmOptions("-Xms32m -Xmx512m"); } private void addNodeSpecificComponents() { 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 22f7a10ab05..0ba5b51bfe1 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 @@ -205,7 +205,7 @@ public class MetricsProxyContainerClusterTest { } - private String servicesWithAdminOnly() { + private static String servicesWithAdminOnly() { return String.join("\n", "<services>", " <admin version='4.0'>", " <adminserver hostalias='node1'/>", 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 a1b77332bd2..a10a5dcf4cc 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 @@ -16,6 +16,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getRpcConnectorConfig; import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getVespaServicesConfig; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertEquals; @@ -48,6 +49,14 @@ public class MetricsProxyContainerTest { } @Test + public void metrics_proxy_requires_less_memory_than_other_containers() { + VespaModel model = getModel(servicesWithContent()); + MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID); + assertThat(container.getStartupCommand(), containsString("-Xms32m")); + assertThat(container.getStartupCommand(), containsString("-Xmx512m")); + } + + @Test public void http_server_is_running_on_expected_port() { VespaModel model = getModel(servicesWithContent()); MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID); @@ -129,7 +138,7 @@ public class MetricsProxyContainerTest { } - private String servicesWithManyNodes() { + private static String servicesWithManyNodes() { return String.join("\n", "<services>", " <container version='1.0' id='foo'>", @@ -142,7 +151,7 @@ public class MetricsProxyContainerTest { "</services>"); } - private String servicesWithContent() { + private static String servicesWithContent() { return String.join("\n", "<services>", " <admin version='4.0'>", |