diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-03-20 20:12:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 20:12:38 +0100 |
| commit | 13c55e53d2f39fafc47f372c02127a01f7514d3b (patch) | |
| tree | e9d8f457568972c98ee8e92dcf6248b9ee5518eb | |
| parent | 6cd559b2773b9cff88b7db646d9e6b8f38130b5a (diff) | |
| parent | 47e0b1a6b821e3a041fc8faaff128f1454791704 (diff) | |
Merge pull request #12655 from vespa-engine/jonmv/report-at-end-of-production-jobs
Wait for installReal step before doing report step
4 files changed, 4 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 7c5c8d55e2a..b26e8fa5f05 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -565,8 +565,7 @@ public class JobController { public void locked(ApplicationId id, JobType type, Step step, Consumer<LockedStep> action) throws TimeoutException { try (Lock lock = curator.lock(id, type, step)) { for (Step prerequisite : step.prerequisites()) // Check that no prerequisite is still running. - try (Lock __ = curator.lock(id, type, prerequisite)) { - } + try (Lock __ = curator.lock(id, type, prerequisite)) { ; } action.accept(new LockedStep(lock, step)); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java index 75d875a29c5..17cfd1bdf1d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java @@ -65,7 +65,7 @@ public enum Step { deactivateTester(true, deployTester, endTests), /** Report completion to the deployment orchestration machinery. */ - report(true, deactivateReal, deactivateTester); + report(true, installReal, deactivateReal, deactivateTester); private final boolean alwaysRun; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json index 868809978de..e45bd190d5f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json @@ -802,7 +802,7 @@ }, { "name": "report", - "status": "succeeded" + "status": "unfinished" } ] }, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json index 948d46b1a6b..2c43aa45d06 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json @@ -538,7 +538,7 @@ "steps": { "deployReal": "succeeded", "installReal": "unfinished", - "report": "succeeded" + "report": "unfinished" }, "tasks": { "deploy": "succeeded", |