diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-29 09:54:20 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-10-29 09:54:20 +0100 |
| commit | 55b8064a0a98943fd851569360352aa1c7681553 (patch) | |
| tree | dc78c286490531301154de0eb45c8ae550b9a9fd /controller-server/src | |
| parent | 9a1efcb9aca844b1e723f740dff8f908161b505c (diff) | |
Propagate disk-speed
Diffstat (limited to 'controller-server/src')
| -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 | 2 |
2 files changed, 3 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 e548d3aec28..970a57ed75e 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 @@ -704,7 +704,8 @@ public class InternalStepRunner implements StepRunner { int testMemoryMb = (int) (1024 * (resources.memoryGb() - jdiscMemoryGb) / 2); String resourceString = String.format(Locale.ENGLISH, - "<resources vcpu=\"%.2f\" memory=\"%.2fGb\" disk=\"%.2fGb\"/>", resources.vcpu(), resources.memoryGb(), resources.diskGb()); + "<resources vcpu=\"%.2f\" memory=\"%.2fGb\" disk=\"%.2fGb\" disk-speed=\"%s\"/>", + resources.vcpu(), resources.memoryGb(), resources.diskGb(), resources.diskSpeed().name()); AthenzDomain idDomain = ("vespa.vespa.cd".equals(domain.value()) ? AthenzDomain.from("vespa.vespa") : domain); String servicesXml = 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 3b1554c6604..6dc9481636e 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -59,7 +59,7 @@ </http> <nodes count="1" allocated-memory="17%"> - <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb"/> + <resources vcpu="2.00" memory="12.00Gb" disk="75.00Gb" disk-speed="fast"/> </nodes> </container> </services> |