summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-10-12 21:34:59 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2019-10-12 21:34:59 +0200
commit49d3ac74b3976f2d0b2f9c66d64a160651b09bf8 (patch)
tree022cf2f467b789dc8e1b30364c5f34c2afdf7e08 /config-model
parent49e0d50137c4e6294fc52dca3828077aea960212 (diff)
Only override what you really need.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java1
2 files changed, 1 insertions, 2 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 8dff6aeb830..97579958d7b 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
@@ -49,7 +49,7 @@ public class MetricsProxyContainer extends Container implements
setProp("index", String.valueOf(index));
addNodeSpecificComponents();
- appendJvmOptions("-Xms32m -Xmx512m");
+ appendJvmOptions("-Xms32m");
}
private void addNodeSpecificComponents() {
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 2e13ae3b66e..352a6a624ae 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
@@ -54,7 +54,6 @@ public class MetricsProxyContainerTest {
VespaModel model = getModel(servicesWithContent(), self_hosted);
MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
assertThat(container.getStartupCommand(), containsString("-Xms32m"));
- assertThat(container.getStartupCommand(), containsString("-Xmx512m"));
}
@Test