diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-02 17:42:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 17:42:39 +0100 |
| commit | 5ebf0c8733d462324649022757e108950ba6004e (patch) | |
| tree | 9114c15dd972d4782aa758250f4581377dea3263 | |
| parent | 5d72bdae4df1e699202bc2f38212e763018036cd (diff) | |
| parent | 1c8b644052897adcd59f5372194e1d13cc2df9ae (diff) | |
Merge pull request #16746 from vespa-engine/hmusum/run-migrator-more-often-and-later-in-the-day
Run one hour longer in the day and every 40 minutes per server
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java index 6ea77554012..4588fc13875 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DedicatedClusterControllerClusterMigrator.java @@ -44,7 +44,7 @@ public class DedicatedClusterControllerClusterMigrator extends ApplicationMainta ZonedDateTime date = ZonedDateTime.ofInstant(clock().instant(), java.time.ZoneId.of("Europe/Oslo")); if ( ! nodeRepository().zone().system().isCd() && nodeRepository().zone().environment() != Environment.staging - && (List.of(SATURDAY, SUNDAY).contains(date.getDayOfWeek()) || date.getHour() < 8 || 12 < date.getHour())) + && (List.of(SATURDAY, SUNDAY).contains(date.getDayOfWeek()) || date.getHour() < 8 || 13 < date.getHour())) return Set.of(); return nodeRepository().applications().ids().stream() diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index 8929d7f9939..0154b030baa 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -147,7 +147,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { throttlePolicy = NodeFailer.ThrottlePolicy.hosted; retiredExpiry = Duration.ofDays(4); // give up migrating data after 4 days dedicatedClusterControllerMigratorInterval = zone.environment() == Environment.staging || zone.system().isCd() ? Duration.ofMinutes(3) - : Duration.ofHours(3); + : Duration.ofHours(2); if (zone.environment() == Environment.prod && ! zone.system().isCd()) { inactiveExpiry = Duration.ofHours(4); // enough time for the application owner to discover and redeploy |