diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-03-02 14:42:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 14:42:10 +0100 |
| commit | a47851efade7fd1b3acf8afe15b71ee8b972fdfa (patch) | |
| tree | 68f78a1c433dde8b3a5b3bd0add660cca53677a6 /controller-server | |
| parent | c2d421329ab788653165ff5cb1e65f9c96dbe987 (diff) | |
| parent | 755bd5344a78861213df8e61a6175f96a31219c9 (diff) | |
Merge pull request #12396 from vespa-engine/jvenstad/show-block-windows
Show block windows when somethingn _would_ be blocked
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java | 5 |
1 files changed, 4 insertions, 1 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 0d1dca391bd..4d79b7bb24c 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 @@ -597,7 +597,10 @@ class JobControllerApiHandlerHelper { .ifPresent(until -> stepObject.setLong("delayedUntil", until.toEpochMilli())); stepStatus.pausedUntil().ifPresent(until -> stepObject.setLong("pausedUntil", until.toEpochMilli())); stepStatus.coolingDownUntil(change).ifPresent(until -> stepObject.setLong("coolingDownUntil", until.toEpochMilli())); - stepStatus.blockedUntil(change).ifPresent(until -> stepObject.setLong("blockedUntil", until.toEpochMilli())); + stepStatus.blockedUntil(Change.of(controller.systemVersion())) // Dummy version — just anything with a platform. + .ifPresent(until -> stepObject.setLong("platformBlockedUntil", until.toEpochMilli())); + 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.instance) { Cursor deployingObject = stepObject.setObject("deploying"); |