From ef614f1fd2ffbcae8e248612a3b3d94ae79b7029 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 1 Feb 2021 19:03:58 +0100 Subject: Bump interval of maintainers that collide often --- .../hosted/controller/maintenance/ControllerMaintenance.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'controller-server') 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 56b7e5b2e46..429d5b1d06e 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 @@ -118,13 +118,13 @@ public class ControllerMaintenance extends AbstractComponent { this.outstandingChangeDeployer = duration(3, MINUTES); this.versionStatusUpdater = duration(3, MINUTES); this.readyJobsTrigger = duration(1, MINUTES); - this.deploymentMetricsMaintainer = duration(5, MINUTES); + this.deploymentMetricsMaintainer = duration(6, MINUTES); this.applicationOwnershipConfirmer = duration(12, HOURS); - this.systemUpgrader = duration(1, MINUTES); - this.jobRunner = duration(90, SECONDS); + this.systemUpgrader = duration(90, SECONDS); + this.jobRunner = duration(105, SECONDS); this.osUpgrader = duration(1, MINUTES); this.contactInformationMaintainer = duration(12, HOURS); - this.nameServiceDispatcher = duration(10, SECONDS); + this.nameServiceDispatcher = duration(30, SECONDS); this.costReportMaintainer = duration(2, HOURS); this.resourceMeterMaintainer = duration(1, MINUTES); this.cloudEventReporter = duration(30, MINUTES); -- cgit v1.2.3 From 66c649418618de598825fb11ba15b6f2de606236 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 1 Feb 2021 19:06:41 +0100 Subject: Use Exceptions.toMessageString --- .../java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java index 786547d4a67..8a48cbd281d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.controller.dns; import com.yahoo.vespa.hosted.controller.api.integration.dns.NameService; +import com.yahoo.yolean.Exceptions; import java.util.ArrayList; import java.util.Collection; @@ -82,7 +83,7 @@ public class NameServiceQueue { request.dispatchTo(nameService); queue.requests.poll(); } catch (Exception e) { - log.log(Level.WARNING, "Failed to execute " + request + ": " + e.getMessage() + + log.log(Level.WARNING, "Failed to execute " + request + ": " + Exceptions.toMessageString(e) + ", request will be retried"); } } -- cgit v1.2.3 From d0922322a766dd06230227fdacc454ac5c9ddd91 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 2 Feb 2021 10:10:38 +0100 Subject: Keep same JobRunner interval Co-authored-by: Jon Marius Venstad --- .../vespa/hosted/controller/maintenance/ControllerMaintenance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'controller-server') 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 429d5b1d06e..979f725fc2c 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 @@ -121,7 +121,7 @@ public class ControllerMaintenance extends AbstractComponent { this.deploymentMetricsMaintainer = duration(6, MINUTES); this.applicationOwnershipConfirmer = duration(12, HOURS); this.systemUpgrader = duration(90, SECONDS); - this.jobRunner = duration(105, SECONDS); + this.jobRunner = duration(90, SECONDS); this.osUpgrader = duration(1, MINUTES); this.contactInformationMaintainer = duration(12, HOURS); this.nameServiceDispatcher = duration(30, SECONDS); -- cgit v1.2.3 From 1187c259c64377e14d9e1da632d5364e10fa4fbf Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 2 Feb 2021 10:10:56 +0100 Subject: Increase DeploymentMetricsMaintainer interval Co-authored-by: Jon Marius Venstad --- .../vespa/hosted/controller/maintenance/ControllerMaintenance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'controller-server') 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 979f725fc2c..979cd9060d9 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 @@ -118,7 +118,7 @@ public class ControllerMaintenance extends AbstractComponent { this.outstandingChangeDeployer = duration(3, MINUTES); this.versionStatusUpdater = duration(3, MINUTES); this.readyJobsTrigger = duration(1, MINUTES); - this.deploymentMetricsMaintainer = duration(6, MINUTES); + this.deploymentMetricsMaintainer = duration(10, MINUTES); this.applicationOwnershipConfirmer = duration(12, HOURS); this.systemUpgrader = duration(90, SECONDS); this.jobRunner = duration(90, SECONDS); -- cgit v1.2.3