From acba5c6d20da4f744647b59d84d974ad00a01e34 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 5 Feb 2021 10:31:52 +0100 Subject: Ignore maintenance collisions in controller and node-repository --- .../yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'controller-server/src') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java index 9bf6352813a..03a6268397e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java @@ -34,7 +34,7 @@ public abstract class ControllerMaintainer extends Maintainer { public ControllerMaintainer(Controller controller, Duration interval, String name, Set activeSystems) { super(name, interval, controller.clock().instant(), controller.jobControl(), - jobMetrics(controller.metric()), controller.curator().cluster()); + jobMetrics(controller.metric()), controller.curator().cluster(), true); this.controller = controller; this.activeSystems = Set.copyOf(Objects.requireNonNull(activeSystems)); } -- cgit v1.2.3 From 9ef963a88963eef39056a65dbbb591a3fcad54a4 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 5 Feb 2021 10:33:20 +0100 Subject: Revert back to initial NameServiceDispatcher interval --- .../vespa/hosted/controller/maintenance/ControllerMaintenance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'controller-server/src') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java index 75f8419b336..b32b4ec73fb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java @@ -125,7 +125,7 @@ public class ControllerMaintenance extends AbstractComponent { this.osVersionStatusUpdater = duration(2, MINUTES); this.osUpgrader = duration(1, MINUTES); this.contactInformationMaintainer = duration(12, HOURS); - this.nameServiceDispatcher = duration(30, SECONDS); + this.nameServiceDispatcher = duration(10, SECONDS); this.costReportMaintainer = duration(2, HOURS); this.resourceMeterMaintainer = duration(3, MINUTES); this.cloudEventReporter = duration(30, MINUTES); -- cgit v1.2.3