diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-10-14 11:18:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 11:18:56 +0200 |
| commit | 54e3be422fec0593511dc55b1a11deab65bef9ff (patch) | |
| tree | b400b1d796236238319f49dc8048a6d1cd6c309b /controller-server | |
| parent | 2146634270ffd8d6960249302cb29b47c5d79cb7 (diff) | |
| parent | bbf416be4dbe27aa489e49b7f46f668d36687406 (diff) | |
Merge pull request #24446 from vespa-engine/mpolden/ignore-empty-version
Ignore empty version when verifying major upgrade
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java index 16f62c37ffa..502b3b0188f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java @@ -55,6 +55,7 @@ public class OsUpgradeScheduler extends ControllerMaintainer { private boolean upgradingToNewMajor(CloudName cloud) { return controller().osVersionStatus().versionsIn(cloud).stream() + .filter(version -> !version.isEmpty()) // Ignore empty/unknown versions .map(Version::getMajor) .distinct() .count() > 1; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json index 7a8eef983f1..68ac684b0fb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json @@ -163,6 +163,8 @@ "targetVersion": true, "upgradeBudget": "PT24H", "scheduledAt": 1234, + "nextVersion": "8.2.1.20211228", + "nextScheduledAt": 1640743200000, "cloud": "cloud2", "nodes": [ ] } |