diff options
2 files changed, 3 insertions, 2 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java index bd105c5c6c1..f66754937bd 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java @@ -99,7 +99,7 @@ public class ClusterController extends AbstractComponent private void verifyThatZooKeeperWorks(FleetControllerOptions options) throws Exception { if (options.zooKeeperServerAddress != null && !"".equals(options.zooKeeperServerAddress)) { try (Curator curator = Curator.create(options.zooKeeperServerAddress)) { - if ( ! curator.framework().blockUntilConnected(60, TimeUnit.SECONDS)) + if ( ! curator.framework().blockUntilConnected(600, TimeUnit.SECONDS)) com.yahoo.protect.Process.logAndDie("Failed to connect to ZK, dying and restarting container"); } } 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 375fb16dc76..7fbf652f0b4 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 @@ -43,7 +43,8 @@ public class DedicatedClusterControllerClusterMigrator extends ApplicationMainta if (deployer().bootstrapping()) return Set.of(); ZonedDateTime date = ZonedDateTime.ofInstant(clock().instant(), java.time.ZoneId.of("Europe/Oslo")); - if (List.of(SATURDAY, SUNDAY).contains(date.getDayOfWeek()) || date.getHour() < 8 || 12 < date.getHour()) + if ( ! nodeRepository().zone().system().isCd() + && (List.of(SATURDAY, SUNDAY).contains(date.getDayOfWeek()) || date.getHour() < 8 || 12 < date.getHour())) return Set.of(); return nodeRepository().applications().ids().stream() |