diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-12 14:48:45 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-12 14:48:45 +0200 |
| commit | 09dc37cf0b3585b92fc5c0d480f8c640d2df303c (patch) | |
| tree | ccbda5e099160435dcfe13cef8d1179dc3c4c7cb /controller-server | |
| parent | b308b2bd6fd91d043ddc12498a5e5f587b09eb7c (diff) | |
Differentiate between waiting for slot and current deployment
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 8976bcd4dff..f51f292299d 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 @@ -157,7 +157,10 @@ class JobControllerApiHandlerHelper { .findAny().map(blocker -> blocker.window().toString()).get()); } else - lastPlatformObject.setString("pending", "Waiting for current deployment to complete"); + lastPlatformObject.setString("pending", + application.changeAt(controller.clock().instant()).isPresent() + ? "Waiting for current deployment to complete" + : "Waiting for upgrade slot"); } private static void lastApplicationToSlime(Cursor lastApplicationObject, Application application, Change change, DeploymentSteps steps, Controller controller) { |