aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-02-24 09:26:20 +0100
committerMartin Polden <mpolden@mpolden.no>2021-02-24 09:26:20 +0100
commitc0d49222567d1190d5d35fba3aa3860c30c7ac63 (patch)
treea3efe04dfc554e9543d396287c8af31c17b7ba07 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
parentbbbf05b39c616370388a779d2a801f26568c9d71 (diff)
Treat newer OS version as converged
This is required now that nodes can choose the "closest" version on upgrade.
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
index 66fb20e8a71..0f64f839c95 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java
@@ -52,7 +52,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> {
@Override
protected boolean convergedOn(OsVersionTarget target, SystemApplication application, ZoneApi zone) {
- return currentVersion(zone, application, target.osVersion().version()).equals(target.osVersion().version());
+ return !currentVersion(zone, application, target.osVersion().version()).isBefore(target.osVersion().version());
}
@Override