diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-09-02 15:53:11 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-09-02 15:53:11 +0200 |
| commit | 384c302525ae2f4918742d2899f5eba1dfad133c (patch) | |
| tree | c75f892aa8b761c38a76a2821851b4d98166356c /controller-server | |
| parent | 4f6642f01d0cb3c66110d48b4885e3d369975faf (diff) | |
Add status for manual deployments in application v4
Diffstat (limited to 'controller-server')
2 files changed, 8 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index e2f456b33f0..b6218afcbae 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -143,7 +143,6 @@ import java.util.OptionalLong; import java.util.Scanner; import java.util.StringJoiner; import java.util.logging.Level; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -1420,6 +1419,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { response.setString("status", "pending"); else response.setString("status", "running"); }); + } else { + var deploymentRun = JobType.from(controller.system(), deploymentId.zoneId()) + .flatMap(jobType -> controller.jobController().last(deploymentId.applicationId(), jobType)); + + deploymentRun.ifPresent(run -> { + response.setString("status", run.hasEnded() ? "complete" : "running"); + }); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1.json index d61bebc81d1..f2f8e14f093 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1.json @@ -21,6 +21,7 @@ "revision": "(ignore)", "deployTimeEpochMs": "(ignore)", "screwdriverId": "123", + "status": "complete", "quota": "(ignore)", "activity": { "lastQueried": 1527848130000, |