diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-02-22 11:00:34 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-02-22 11:00:34 +0100 |
| commit | 9a669c701c439f97fd1b1025010dbc10e91296cb (patch) | |
| tree | 31aea40c3c90605f361243798a46f18854a1c4b5 /controller-server | |
| parent | dc5882d2695456341d77a326b84a2df0464bec47 (diff) | |
Move away from deprecated 'allocated-memory' attribute in nodes element
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 3 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 3 |
2 files changed, 4 insertions, 2 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 532f19eee21..3f83200bb86 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 @@ -1000,7 +1000,8 @@ public class InternalStepRunner implements StepRunner { " </config>\n" + " </component>\n" + "\n" + - " <nodes count=\"1\" allocated-memory=\"" + jdiscMemoryPct + "%\">\n" + + " <nodes count=\"1\">\n" + + " <jvm allocated-memory=\"" + jdiscMemoryPct + "%\"/>\n" + " " + resourceString + "\n" + " </nodes>\n" + " </container>\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 4ab4b08351a..526fd12965b 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -32,7 +32,8 @@ </config> </component> - <nodes count="1" allocated-memory="17%"> + <nodes count="1"> + <jvm allocated-memory="17%"/> <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast" storage-type="local"/> </nodes> </container> |