Outer try-catch was in error; reduce log impact of inner one instead

2 files changed, 9 insertions, 19 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
index 349f4390fd1..b2b69a81dbc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationOwnershipConfirmer.java
@@ -37,13 +37,8 @@ public class ApplicationOwnershipConfirmer extends Maintainer {
 
     @Override
     protected void maintain() {
-        try {
-            confirmApplicationOwnerships();
-            ensureConfirmationResponses();
-        }
-        catch (UncheckedIOException e) {
-            log.log(Level.INFO, () -> "IO exception handling issues, will retry in " + maintenanceInterval() + ": '" + Exceptions.toMessageString(e));
-        }
+        confirmApplicationOwnerships();
+        ensureConfirmationResponses();
     }
 
     /** File an ownership issue with the owners of all applications we know about. */
@@ -65,7 +60,7 @@ public class ApplicationOwnershipConfirmer extends Maintainer {
                                ourIssueId.ifPresent(issueId -> store(issueId, application.id()));
                            }
                            catch (RuntimeException e) { // Catch errors due to wrong data in the controller, or issues client timeout.
-                               log.log(Level.WARNING, "Exception caught when attempting to file an issue for " + application.id(), e);
+                               log.log(Level.INFO, "Exception caught when attempting to file an issue for '" + application.id() + "': " + Exceptions.toMessageString(e));
                            }
                        });
 
@@ -84,7 +79,7 @@ public class ApplicationOwnershipConfirmer extends Maintainer {
                     ownershipIssues.ensureResponse(issueId, propertyId);
                 }
                 catch (RuntimeException e) {
-                    log.log(Level.WARNING, "Exception caught when attempting to escalate issue with id " + issueId, e);
+                    log.log(Level.INFO, "Exception caught when attempting to escalate issue with id '" + issueId + "': " + Exceptions.toMessageString(e));
                 }
             });
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
index c9718af7dff..11e0ada6c36 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
@@ -48,14 +48,9 @@ public class DeploymentIssueReporter extends Maintainer {
 
     @Override
     protected void maintain() {
-        try {
-            maintainDeploymentIssues(applications());
-            maintainPlatformIssue(applications());
-            escalateInactiveDeploymentIssues(applications());
-        }
-        catch (UncheckedIOException e) {
-            log.log(Level.INFO, () -> "IO exception handling issues, will retry in " + maintenanceInterval() + ": '" + Exceptions.toMessageString(e));
-        }
+        maintainDeploymentIssues(applications());
+        maintainPlatformIssue(applications());
+        escalateInactiveDeploymentIssues(applications());
     }
 
     /** Returns the applications to maintain issue status for. */
@@ -137,7 +132,7 @@ public class DeploymentIssueReporter extends Maintainer {
             store(applicationId, issueId);
         }
         catch (RuntimeException e) { // Catch errors due to wrong data in the controller, or issues client timeout.
-            log.log(Level.WARNING, "Exception caught when attempting to file an issue for " + applicationId, e);
+            log.log(Level.INFO, "Exception caught when attempting to file an issue for '" + applicationId + "': " + Exceptions.toMessageString(e));
         }
     }
 
@@ -153,7 +148,7 @@ public class DeploymentIssueReporter extends Maintainer {
                 deploymentIssues.escalateIfInactive(issueId, propertyId, maxInactivity);
             }
             catch (RuntimeException e) {
-                log.log(Level.WARNING, "Exception caught when attempting to escalate issue with id " + issueId, e);
+                log.log(Level.INFO, "Exception caught when attempting to escalate issue with id '" + issueId + "': " + Exceptions.toMessageString(e));
             }
         }));
     }