summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-09-16 09:39:21 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-09-16 09:39:21 +0200
commit8b51c6adbdb5c5cc05b24150693a5fa1886e3692 (patch)
tree3618a26e37fe40c264a7ba20a017d4a2d1bbd07d /controller-server/src
parent90ff5174d9ef863d3e01c1cd58ae32a26d6aa37e (diff)
Make deployment job info messages INFO level
Diffstat (limited to 'controller-server/src')
-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/deployment/InternalStepRunnerTest.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json18
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json18
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json4
5 files changed, 23 insertions, 23 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 724316da150..679af1a5a8c 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
@@ -795,7 +795,7 @@ public class InternalStepRunner implements StepRunner {
}
private void log(List<String> messages) {
- controller.jobController().log(id, step, DEBUG, messages);
+ controller.jobController().log(id, step, INFO, messages);
}
private void log(Level level, String message) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 55873d5df16..20259acff90 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -278,7 +278,7 @@ public class InternalStepRunnerTest {
tester.runner().run();
assertTestLogEntries(id, Step.endTests,
new LogEntry(lastId + 1, Instant.ofEpochMilli(321), error, "Failure!"),
- new LogEntry(lastId + 2, tester.clock().instant(), debug, "Tests failed."));
+ new LogEntry(lastId + 2, tester.clock().instant(), info, "Tests failed."));
assertEquals(failed, tester.jobs().run(id).get().steps().get(Step.endTests));
}
@@ -330,7 +330,7 @@ public class InternalStepRunnerTest {
new LogEntry(lastId + 1, Instant.ofEpochMilli(123), info, "Ready!"),
new LogEntry(lastId + 2, Instant.ofEpochMilli(1234), info, "Steady!"),
new LogEntry(lastId + 3, Instant.ofEpochMilli(12345), info, "Success!"),
- new LogEntry(lastId + 4, tester.clock().instant(), debug, "Tests completed successfully."));
+ new LogEntry(lastId + 4, tester.clock().instant(), info, "Tests completed successfully."));
assertEquals(succeeded, tester.jobs().run(id).get().steps().get(Step.endTests));
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index 5cd1afa3fb9..21ef5035481 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -3,49 +3,49 @@
"deployReal": [
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Deploying platform version 6.1 and application version unknown ..."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "No services requiring restart."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Deployment successful."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "foo"
}
],
"installReal": [
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Checking installation of 6.1 and unknown ..."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": " host-tenant:application:default-dev.us-east-1: unorchestrated 6.1 "
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Wanted config generation is 2"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": " host-tenant:application:default-dev.us-east-1: container on port 43 has config generation 1"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Installation not yet complete."
}
],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
index 57b3f382c76..6f0c5c8a384 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-second-part.json
@@ -3,47 +3,47 @@
"installReal": [
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Checking installation of 6.1 and unknown ..."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": " host-tenant:application:default-dev.us-east-1: unorchestrated 6.1 "
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Wanted config generation is 2"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "All services on wanted config generation."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Attempting to find deployment endpoints ..."
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Found endpoints:"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "- dev.us-east-1"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": " |-- https://default--application--tenant.us-east-1.dev.vespa:43 (cluster 'default')"
},
{
"at": 0,
- "type": "debug",
+ "type": "info",
"message": "Installation succeeded!"
}
]
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
index 6d58392cb25..e344ef07762 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json
@@ -5,14 +5,14 @@
"deployTester": [
{
"at": 1000,
- "type": "debug",
+ "type": "info",
"message": "Deployment failed: ERROR!"
}
],
"deactivateTester": [
{
"at": 1000,
- "type": "debug",
+ "type": "info",
"message": "Deactivating tester of tenant.application in prod.us-east-3 ..."
}
]