diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-10-29 10:46:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 10:46:11 +0100 |
| commit | fb369b1694935933d888533bab79435238107dd5 (patch) | |
| tree | 996f3c1e235e86a42435dab4c6c6f0fda5d9c7e3 /controller-server | |
| parent | 26071f79b70e6ecc2ab00952caa55ca20156d6e7 (diff) | |
| parent | 55b8064a0a98943fd851569360352aa1c7681553 (diff) | |
Merge pull request #11144 from vespa-engine/bratseth/tester-disk-speed-any
Use DiskSpeed.any for testers
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 9 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 2 |
2 files changed, 7 insertions, 4 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 93934fc5105..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 @@ -100,10 +100,12 @@ import static java.util.logging.Level.WARNING; public class InternalStepRunner implements StepRunner { private static final Logger logger = Logger.getLogger(InternalStepRunner.class.getName()); - private static final NodeResources DEFAULT_TESTER_RESOURCES = new NodeResources(1, 4, 50, 0.3); + private static final NodeResources DEFAULT_TESTER_RESOURCES = + new NodeResources(1, 4, 50, 0.3, NodeResources.DiskSpeed.any); // Must match exactly the advertised resources of an AWS instance type. Also consider that the container // will have ~1.8 GB less memory than equivalent resources in AWS (VESPA-16259). - private static final NodeResources DEFAULT_TESTER_RESOURCES_AWS = new NodeResources(2, 8, 50, 0.3); + private static final NodeResources DEFAULT_TESTER_RESOURCES_AWS = + new NodeResources(2, 8, 50, 0.3, NodeResources.DiskSpeed.any); static final Duration endpointTimeout = Duration.ofMinutes(15); static final Duration testerTimeout = Duration.ofMinutes(30); @@ -702,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> |