summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-06-12 23:23:44 +0200
committerHarald Musum <musum@yahooinc.com>2023-06-12 23:23:44 +0200
commit17139657d7a465a40d6f21cc0c71aaeab5360636 (patch)
tree89d08afb6b9a78b3d3d23390ed204c9dea07d928 /controller-server
parent25fcb6dcb1b6463f68e14209d965128cd287d530 (diff)
Change message
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json12
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json12
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 0b3c61858c2..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 not up and running with new config");
+ 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 9028efcdcdc..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 not up and running with new config"
+ "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 378a26ab7d6..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 not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 1600000000000,
@@ -172,7 +172,7 @@
{
"at": 1600000000000,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 1600000000000,
@@ -197,7 +197,7 @@
{
"at": 1600000000000,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 1600000000000,
@@ -222,7 +222,7 @@
{
"at": 1600000000000,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 1600000000000,
@@ -247,7 +247,7 @@
{
"at": 1600000000000,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 1600000000000,
@@ -272,7 +272,7 @@
{
"at": 1600000000000,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "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 34863baeeb2..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 not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,
@@ -167,7 +167,7 @@
{
"at": 0,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,
@@ -192,7 +192,7 @@
{
"at": 0,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,
@@ -217,7 +217,7 @@
{
"at": 0,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,
@@ -242,7 +242,7 @@
{
"at": 0,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,
@@ -267,7 +267,7 @@
{
"at": 0,
"type": "info",
- "message": "1 application services not up and running with new config"
+ "message": "1 application services still deploying"
},
{
"at": 0,