Merge pull request #27390 from vespa-engine/hmusum/change-info-messsage-for-services-missing-new-config

Change message when service is not up and running with new config

4 files changed, 14 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 59ebe0d07d3..e19915fbd24 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -356,7 +356,7 @@ public class InternalStepRunner implements StepRunner {
             if (summary.upgradingOs() > 0)
                 logger.log(summary.upgradingOs() + " nodes upgrading OS");
             if (summary.needNewConfig() > 0)
-                logger.log(summary.needNewConfig() + " application services upgrading");
+                logger.log(summary.needNewConfig() + " application services still deploying");
         }
         if (summary.converged()) {
             controller.jobController().locked(id, lockedRun -> lockedRun.withSummary(null));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index 0b8937c31a4..ae44c851dc0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -127,7 +127,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 14503000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
index 638a7e24ee7..c79dcc99ecf 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
@@ -147,7 +147,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
@@ -172,7 +172,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
@@ -197,7 +197,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
@@ -222,7 +222,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
@@ -247,7 +247,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
@@ -272,7 +272,7 @@
       {
         "at": 1600000000000,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 1600000000000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
index a8b38079b6f..830512f2fcd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
@@ -142,7 +142,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,
@@ -167,7 +167,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,
@@ -192,7 +192,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,
@@ -217,7 +217,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,
@@ -242,7 +242,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,
@@ -267,7 +267,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "1 application services upgrading"
+        "message": "1 application services still deploying"
       },
       {
         "at": 0,