diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-08-15 22:40:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 22:40:00 +0200 |
| commit | 02ec6bf9f89169f7bf8552f386da8671d1fbdff2 (patch) | |
| tree | bc114b99faa3a6415c1bbb1ae7ce5028bbd971ec | |
| parent | 6de8bd8f16366dce6e3a9a7f22e4516120c72c07 (diff) | |
| parent | 697884fc1015e3469610fd7b12c64e02352d91ff (diff) | |
Merge pull request #23665 from vespa-engine/mpolden/fix-off-by-one
Avoid off-by-one if version can be triggered the same day
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeScheduler.java | 3 |
1 files changed, 2 insertions, 1 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 ddcfef23d86..2d0424e9f03 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 @@ -119,6 +119,7 @@ public class OsUpgradeScheduler extends ControllerMaintainer { Objects.requireNonNull(artifactRepository); } + @Override public Optional<Change> change(Version currentVersion, Instant instant) { OsRelease release = artifactRepository.osRelease(currentVersion.getMajor(), tag()); if (!release.version().isAfter(currentVersion)) return Optional.empty(); @@ -162,8 +163,8 @@ public class OsUpgradeScheduler extends ControllerMaintainer { public Optional<Change> change(Version currentVersion, Instant instant) { Version wantedVersion = asVersion(dateOfWantedVersion(instant), currentVersion); while (!wantedVersion.isAfter(currentVersion)) { - wantedVersion = asVersion(dateOfWantedVersion(instant), currentVersion); instant = instant.plus(Duration.ofDays(1)); + wantedVersion = asVersion(dateOfWantedVersion(instant), currentVersion); } return Optional.of(new Change(wantedVersion, upgradeBudget(), schedulingInstant(instant, system))); } |