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 */