From 09dc37cf0b3585b92fc5c0d480f8c640d2df303c Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 12 Sep 2018 14:48:45 +0200 Subject: Differentiate between waiting for slot and current deployment --- .../restapi/application/JobControllerApiHandlerHelper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'controller-server') 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) { -- cgit v1.2.3