diff options
| author | Torbjørn Smørgrav <smorgrav@users.noreply.github.com> | 2020-04-08 10:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 10:53:07 +0200 |
| commit | 07ff54c682b570d3347d1b4b10d1bfc8bee162ae (patch) | |
| tree | 54b8ac83a217756144e6616e44322d74c640bcaa /controller-server/src/main/java/com | |
| parent | d27bf5e4fac083e3255b781ef4a1debba2a8ae5f (diff) | |
| parent | 547ca7160d4b07a722b51b5c1fd51b0ddfafcb1b (diff) | |
Merge pull request #12874 from vespa-engine/jvenstad/all-jobs-in-deployment-api
Add completedAt to delay steps
Diffstat (limited to 'controller-server/src/main/java/com')
| -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()) { |