diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-05-20 15:33:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:33:55 +0200 |
| commit | a53a8aabdf5c25447a28225097e9ce79384939bd (patch) | |
| tree | 8ad293420661e2d739e71b521ca319d936cb6f9e /controller-server | |
| parent | 76ba63447cf79f4b4f9e3c2668a2b8bf2bc69633 (diff) | |
| parent | 96c17d9d72183e604e50e6a408fd52aa762da049 (diff) | |
Merge pull request #9459 from vespa-engine/jvenstad/less-memory-for-tests
Allocate 50% of remaining node memory to surefire tests
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 2 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 2 |
2 files changed, 2 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 fe45840bee2..78e1d4756fb 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 @@ -654,7 +654,7 @@ public class InternalStepRunner implements StepRunner { String flavor = testerFlavor.orElse("d-1-4-50"); int memoryGb = Integer.parseInt(flavor.split("-")[2]); // Memory available in tester container. int jdiscMemoryPercentage = (int) Math.ceil(200.0 / memoryGb); // 2Gb memory for tester application (excessive?). - int testMemoryMb = 768 * (memoryGb - 2); // Memory allocated to Surefire running tests. ≥25% left for other stuff. + int testMemoryMb = 512 * (memoryGb - 2); // Memory allocated to Surefire running tests. ≥25% left for other stuff. String servicesXml = "<?xml version='1.0' encoding='UTF-8'?>\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 6a01b612c3c..df276f9bbbc 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -5,7 +5,7 @@ <component id="com.yahoo.vespa.hosted.testrunner.TestRunner" bundle="vespa-testrunner-components"> <config name="com.yahoo.vespa.hosted.testrunner.test-runner"> <artifactsPath>artifacts</artifactsPath> - <surefireMemoryMb>7680</surefireMemoryMb> + <surefireMemoryMb>5120</surefireMemoryMb> </config> </component> |