diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-05-06 11:16:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 11:16:08 +0200 |
| commit | 580fdf55b7bbb24093f21500438c58c718c564e4 (patch) | |
| tree | 4038e7a27bd4790bca71a433d0cb612bf54ec0dc /controller-server | |
| parent | 64cea70839751c26ff1fe6ce4c55581068ce43c7 (diff) | |
| parent | 696961ce299ac6150cfc244b0297af95474a2884 (diff) | |
Merge pull request #17758 from vespa-engine/mpolden/reduce-upgrade-frequency
Wait longer between automatic OS upgrades
Diffstat (limited to 'controller-server')
2 files changed, 4 insertions, 4 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 04b06b3e1f6..e1618f05a7d 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 @@ -27,7 +27,7 @@ import java.util.stream.Collectors; public class OsUpgradeScheduler extends ControllerMaintainer { /** Trigger a new upgrade when the current target version reaches this age */ - private static final Duration MAX_VERSION_AGE = Duration.ofDays(30); + private static final Duration MAX_VERSION_AGE = Duration.ofDays(45); /** * The interval at which new versions become available. We use this to avoid scheduling upgrades to a version that diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java index 76781d964a1..7d512ba090c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java @@ -40,14 +40,14 @@ public class OsUpgradeSchedulerTest { tester.controller().upgradeOsIn(cloud, version0, Duration.ofDays(1), false); // Target remains unchanged as it hasn't expired yet - for (var interval : List.of(Duration.ZERO, Duration.ofDays(15))) { + for (var interval : List.of(Duration.ZERO, Duration.ofDays(30))) { tester.clock().advance(interval); scheduler.maintain(); assertEquals(version0, tester.controller().osVersionTarget(cloud).get().osVersion().version()); } - // Just over 30 days pass, and a new target replaces the expired one - Version version1 = Version.fromString("7.0.0.20210215"); + // Just over 45 days pass, and a new target replaces the expired one + Version version1 = Version.fromString("7.0.0.20210302"); tester.clock().advance(Duration.ofDays(15).plus(Duration.ofSeconds(1))); scheduler.maintain(); assertEquals("New target set", version1, tester.controller().osVersionTarget(cloud).get().osVersion().version()); |