From 547ca7160d4b07a722b51b5c1fd51b0ddfafcb1b Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 8 Apr 2020 10:51:26 +0200 Subject: Add completedAt to delay steps --- .../controller/restapi/application/JobControllerApiHandlerHelper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index ef9779812a5..f72439b694a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -604,6 +604,9 @@ class JobControllerApiHandlerHelper { application.latestVersion().map(Change::of).flatMap(stepStatus::blockedUntil) // Dummy version — just anything with an application. .ifPresent(until -> stepObject.setLong("applicationBlockedUntil", until.toEpochMilli())); + if (stepStatus.type() == DeploymentStatus.StepType.delay) + stepStatus.completedAt(change).ifPresent(completed -> stepObject.setLong("completedAt", completed.toEpochMilli())); + if (stepStatus.type() == DeploymentStatus.StepType.instance) { Cursor deployingObject = stepObject.setObject("deploying"); if ( ! change.isEmpty()) { -- cgit v1.2.3