aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-05-22 20:57:53 +0200
committerMartin Polden <mpolden@mpolden.no>2018-05-22 20:57:53 +0200
commit9a0f89b002bba2bc8e23b6438e191a364ecd261a (patch)
tree5558aec6cb61410749bae49d6d5d00566f39fdc0 /controller-server
parentd8615dfa9eaa188512055ee9ad1ad4c8e9b202c6 (diff)
Catch and log exception
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
index 4745894f68c..7cb967e0c82 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java
@@ -39,7 +39,11 @@ public class SystemUpgrader extends Maintainer {
return;
}
// TODO: Change to SystemApplication.all() once host applications support upgrade
- deploy(Arrays.asList(SystemApplication.configServer, SystemApplication.zone), target.get());
+ try {
+ deploy(Arrays.asList(SystemApplication.configServer, SystemApplication.zone), target.get());
+ } catch (Exception e) {
+ log.log(Level.WARNING, "Failed to upgrade system. Retrying in " + maintenanceInterval(), e);
+ }
}
/** Deploy a list of system applications until they converge on the given version */