diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-08-20 12:48:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 12:48:55 +0200 |
| commit | f0755155832c94f9ed2e2abef0b5f306bb591d56 (patch) | |
| tree | 53da218cf31ca688fd6bafa4b9c892a90c1db58b /controller-server | |
| parent | 85a0c57bc0389116a548869536c14a03e4efc660 (diff) | |
Revert "Use new jvm element for tester container JDisc memory setting"
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 4 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index ee559cef6d9..5594203b0a7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -670,9 +670,7 @@ public class InternalStepRunner implements StepRunner { " </filtering>\n" + " </http>\n" + "\n" + - " <nodes count=\"1\" flavor=\"" + flavor + "\">\n" + - " <jvm allocated-memory=\"" + jdiscMemoryPercentage + "%\" />\n" + - " </nodes>\n" + + " <nodes count=\"1\" flavor=\"" + flavor + "\" allocated-memory=\"" + jdiscMemoryPercentage + "%\" />\n" + " </container>\n" + "</services>\n"; diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index f53262fe55f..776c91eb7ef 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -39,8 +39,6 @@ </filtering> </http> - <nodes count="1" flavor="d-2-12-75"> - <jvm allocated-memory="17%" /> - </nodes> + <nodes count="1" flavor="d-2-12-75" allocated-memory="17%" /> </container> </services> |