diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-04-08 10:51:26 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-04-08 10:51:26 +0200 |
| commit | 547ca7160d4b07a722b51b5c1fd51b0ddfafcb1b (patch) | |
| tree | cc07d014bacc18e0f56512f3df495b6edcb8052b | |
| parent | 7bae03fa21e90e67c64d46caf0ad1c3eaf2714d0 (diff) | |
Add completedAt to delay steps
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
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()) { |