diff options
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 4 |
1 files changed, 2 insertions, 2 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 e644962fe9b..a71ce4299b1 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 @@ -64,7 +64,7 @@ public class SystemUpgrader extends Maintainer { if (convergedOn(target, application.dependencies(), zone)) { deploy(target, application, zone); } - converged &= convergedOn(target, application, zone) & application.configConvergedIn(zone, controller()); + converged &= convergedOn(target, application, zone); } return converged; } @@ -83,7 +83,7 @@ public class SystemUpgrader extends Maintainer { } private boolean convergedOn(Version target, SystemApplication application, ZoneId zone) { - return currentVersion(zone, application, target).equals(target); + return currentVersion(zone, application, target).equals(target) && application.configConvergedIn(zone, controller()); } private Version wantedVersion(ZoneId zone, SystemApplication application, Version defaultVersion) { |