diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-10-22 14:24:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-22 14:24:57 +0200 |
commit | 1f3b8d3dccd622a64cf710fe3b6f77cb26b20269 (patch) | |
tree | 4736f1ddc335b486d0e4c5828f975d2b02027699 | |
parent | c8085c330491daaa482a20a7b1052158cdef5bee (diff) | |
parent | 99735edbaf1db39774550020edab61c0d61d2318 (diff) |
Merge pull request #11048 from vespa-engine/bratseth/say-it-may-take-a-long-time
Say it may take a long time
3 files changed, 4 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 34fe73176c9..5d83f4848e5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1384,7 +1384,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler { RunId runId = controller.jobController().last(id, type).get().id(); Slime slime = new Slime(); Cursor rootObject = slime.setObject(); - rootObject.setString("message", "Deployment started in " + runId); + rootObject.setString("message", "Deployment started in " + runId + + ". This may take about 15 minutes the first time."); rootObject.setLong("run", runId.number()); return new SlimeJsonResponse(slime); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json index 69391cc7562..ae089b504c8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json @@ -1,4 +1,4 @@ { - "message": "Deployment started in run 1 of dev-us-east-1 for tenant1.application1.otheruser", + "message": "Deployment started in run 1 of dev-us-east-1 for tenant1.application1.otheruser. This may take about 15 minutes the first time.", "run": 1 }
\ No newline at end of file diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted.json index 65ecb3c6979..d37e9120837 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted.json @@ -1,4 +1,4 @@ { - "message": "Deployment started in run 1 of dev-us-east-1 for tenant1.application1.instance1", + "message": "Deployment started in run 1 of dev-us-east-1 for tenant1.application1.instance1. This may take about 15 minutes the first time.", "run": 1 }
\ No newline at end of file |