diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-05-31 09:32:47 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-05-31 09:32:47 +0200 |
commit | d7bb6cb9d29dec33f7a93a06a41c0a36caf26871 (patch) | |
tree | ee1bddf08a8f0a7d125aca9899a3edfc724a7263 | |
parent | b7c8f12fb1a6d27505f5400e4077c9f46d27c173 (diff) |
Re-order argumnets, add convergedOn() for List of Applications
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 12 |
1 files changed, 7 insertions, 5 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 ddea4e1e387..ac0d08f5105 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 @@ -66,12 +66,10 @@ public class SystemUpgrader extends Maintainer { private boolean deployInZone(ZoneId zone, List<SystemApplication> applications, Version target) { boolean converged = true; for (SystemApplication application : applications) { - boolean dependenciesConverged = application.dependencies().stream() - .allMatch(dependency -> convergedOn(zone, dependency, target)); - if (dependenciesConverged) { + if (convergedOn(target, application.dependencies(), zone)) { deploy(target, application, zone); } - converged &= convergedOn(zone, application, target); + converged &= convergedOn(target, application, zone); } return converged; } @@ -84,7 +82,11 @@ public class SystemUpgrader extends Maintainer { } } - private boolean convergedOn(ZoneId zone, SystemApplication application, Version target) { + private boolean convergedOn(Version target, List<SystemApplication> applications, ZoneId zone) { + return applications.stream().allMatch(application -> convergedOn(target, application, zone)); + } + + private boolean convergedOn(Version target, SystemApplication application, ZoneId zone) { return currentVersion(zone, application.id(), target).equals(target); } |