summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <valerij92@gmail.com>2021-04-21 21:30:42 +0200
committerValerij Fredriksen <valerij92@gmail.com>2021-04-21 22:56:55 +0200
commit1d91b03614509706cbede9f121a718b8af656399 (patch)
treedadba010a23b3d12d6cbe2190a35e92486f85628 /controller-server
parent39e3564e0e8fc4a4ae2adc883b78d6c513e4519d (diff)
Raise log level on some errors
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java10
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/us-east-3-log-without-first.json2
2 files changed, 6 insertions, 6 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 548f6a9aaf2..d7465facd72 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
@@ -229,7 +229,7 @@ public class InternalStepRunner implements StepRunner {
case CERTIFICATE_NOT_READY:
logger.log("Waiting for certificate to become ready on config server: New application, or old one has expired");
if (startTime.plus(timeouts.endpointCertificate()).isBefore(controller.clock().instant())) {
- logger.log("Certificate did not become available on config server within (" + timeouts.endpointCertificate() + ")");
+ logger.log(WARNING, "Certificate did not become available on config server within (" + timeouts.endpointCertificate() + ")");
return Optional.of(RunStatus.endpointCertificateTimeout);
}
return result;
@@ -249,7 +249,7 @@ public class InternalStepRunner implements StepRunner {
: Optional.of(outOfCapacity);
case INVALID_APPLICATION_PACKAGE:
case BAD_REQUEST:
- logger.log(e.getMessage());
+ logger.log(WARNING, e.getMessage());
return Optional.of(deploymentFailed);
}
@@ -261,7 +261,7 @@ public class InternalStepRunner implements StepRunner {
// Same as CERTIFICATE_NOT_READY above, only from the controller
logger.log("Waiting for certificate to become valid: New application, or old one has expired");
if (startTime.plus(timeouts.endpointCertificate()).isBefore(controller.clock().instant())) {
- logger.log("Controller could not validate certificate within " +
+ logger.log(WARNING, "Controller could not validate certificate within " +
timeouts.endpointCertificate() + ": " + Exceptions.toMessageString(e));
return Optional.of(RunStatus.endpointCertificateTimeout);
}
@@ -596,7 +596,7 @@ public class InternalStepRunner implements StepRunner {
testerCertificate.get().checkValidity(Date.from(controller.clock().instant()));
}
catch (CertificateExpiredException | CertificateNotYetValidException e) {
- logger.log(INFO, "Tester certificate expired before tests could complete.");
+ logger.log(WARNING, "Tester certificate expired before tests could complete.");
return Optional.of(aborted);
}
}
@@ -702,7 +702,7 @@ public class InternalStepRunner implements StepRunner {
mailOf(run, recipients).ifPresent(controller.serviceRegistry().mailer()::send);
}
catch (RuntimeException e) {
- logger.log(INFO, "Exception trying to send mail for " + run.id(), e);
+ logger.log(WARNING, "Exception trying to send mail for " + run.id(), e);
}
}
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 6c9315ca64b..588f8839ab7 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,7 +5,7 @@
"deployReal": [
{
"at": 1000,
- "type": "info",
+ "type": "warning",
"message": "Failed to deploy application: ERROR!"
}
]