diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-07-08 13:11:34 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-07-08 13:11:34 +0200 |
commit | e8cfb6ec0f697cd8f406607dea8ca047e3133ef8 (patch) | |
tree | e71208e78218814c615887f33f7060d55a1ae63d /controller-server | |
parent | 6d01ee5b7573a455ce1c09c2fa140f724b71383c (diff) |
Schedule OS upgrade less often
Diffstat (limited to 'controller-server')
2 files changed, 13 insertions, 13 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 5e4d6d71ff6..111931b638b 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 @@ -126,7 +126,7 @@ public class OsUpgradeScheduler extends ControllerMaintainer { .toInstant(ZoneOffset.UTC); /** The time that should elapse between versions */ - private static final Duration SCHEDULING_STEP = Duration.ofDays(45); + private static final Duration SCHEDULING_STEP = Duration.ofDays(60); /** The day of week new releases are published */ private static final DayOfWeek RELEASE_DAY = DayOfWeek.MONDAY; 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 478bb943eba..621e847c0d3 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 @@ -53,8 +53,8 @@ public class OsUpgradeSchedulerTest { } // Enough days pass that the next release is triggered - Version version1 = Version.fromString("7.0.0.20220214"); - tester.clock().advance(Duration.ofDays(15).plus(Duration.ofSeconds(1))); + Version version1 = Version.fromString("7.0.0.20220228"); + tester.clock().advance(Duration.ofDays(30)); scheduler.maintain(); assertEquals("Target is unchanged because we're outside trigger period", version0, tester.controller().osVersionTarget(cloud).get().osVersion().version()); @@ -118,18 +118,18 @@ public class OsUpgradeSchedulerTest { @Test public void schedule_of_calender_versioned_releases() { Map<String, String> tests = Map.of("2022-01-01", "2021-12-27", - "2022-02-14", "2021-12-27", - "2022-02-15", "2022-02-14", - "2022-03-31", "2022-02-14", - "2022-04-01", "2022-03-28", - "2022-05-15", "2022-03-28", - "2022-05-16", "2022-05-16", - "2022-06-29", "2022-05-16", - "2022-06-30", "2022-06-27"); - tests.forEach((now, expected) -> { + "2022-03-01", "2021-12-27", + "2022-03-02", "2022-02-28", + "2022-04-30", "2022-02-28", + "2022-05-01", "2022-04-25", + "2022-06-29", "2022-04-25", + "2022-07-01", "2022-06-27", + "2022-08-28", "2022-06-27", + "2022-08-29", "2022-08-29"); + tests.forEach((now, expectedVersion) -> { Instant instant = LocalDate.parse(now).atStartOfDay().toInstant(ZoneOffset.UTC); LocalDate dateOfWantedVersion = OsUpgradeScheduler.CalendarVersionedRelease.dateOfWantedVersion(instant); - assertEquals("scheduled wanted version at " + now, LocalDate.parse(expected), dateOfWantedVersion); + assertEquals("scheduled wanted version at " + now, LocalDate.parse(expectedVersion), dateOfWantedVersion); }); } |