diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-11 11:53:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-11 11:53:18 +0100 |
commit | c330e6538addbe7f81e5728275e0d55207567ad1 (patch) | |
tree | 0c3464af64be71f1a18b1ac938f5a6c750d545eb | |
parent | 4fe6a4cb133b8b4272f7b5a2d75f966c1a108300 (diff) | |
parent | 736992ff43945cd42f180eb7664b1c581d3f1074 (diff) |
Merge pull request #15787 from vespa-engine/hmusum/make-sure-maintainer-runs-with-even-delay-between-nodes-in-cluster
Use staggered delay for all config server maintainers
5 files changed, 4 insertions, 11 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java index 7ccdf161f82..7ba8b1be491 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java @@ -38,7 +38,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer { Curator curator, Duration interval, FlagSource flagSource) { - super(applicationRepository, curator, flagSource, interval, interval); + super(applicationRepository, curator, flagSource, applicationRepository.clock().instant(), interval); this.applicationRepository = applicationRepository; ConfigserverConfig configserverConfig = applicationRepository.configserverConfig(); connectionPool = createConnectionPool(configserverConfig); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java index 70c1b288202..0b70fca8908 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintainer.java @@ -39,13 +39,6 @@ public abstract class ConfigServerMaintainer extends Maintainer { this.applicationRepository = applicationRepository; } - ConfigServerMaintainer(ApplicationRepository applicationRepository, Curator curator, FlagSource flagSource, - Duration initialDelay, Duration interval) { - super(null, interval, initialDelay, new JobControl(new JobControlFlags(curator, flagSource)), - jobMetrics(applicationRepository.metric())); - this.applicationRepository = applicationRepository; - } - private static JobMetrics jobMetrics(Metric metric) { return new JobMetrics((job, consecutiveFailures) -> { metric.set("maintenance.consecutiveFailures", consecutiveFailures, metric.createContext(Map.of("job", job))); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java index 8e5069abfed..6e7fc2ebc31 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/FileDistributionMaintainer.java @@ -26,7 +26,7 @@ public class FileDistributionMaintainer extends ConfigServerMaintainer { Curator curator, Duration interval, FlagSource flagSource) { - super(applicationRepository, curator, flagSource, interval, interval); + super(applicationRepository, curator, flagSource, applicationRepository.clock().instant(), interval); this.applicationRepository = applicationRepository; this.maxUnusedFileReferenceAge = Duration.ofHours(applicationRepository.configserverConfig().keepUnusedFileReferencesHours()); this.fileReferencesDir = new File(Defaults.getDefaults().underVespaHome(applicationRepository.configserverConfig().fileReferencesDir())); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java index e59c334b89f..7482980e221 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/SessionsMaintainer.java @@ -20,7 +20,7 @@ public class SessionsMaintainer extends ConfigServerMaintainer { private int iteration = 0; SessionsMaintainer(ApplicationRepository applicationRepository, Curator curator, Duration interval, FlagSource flagSource) { - super(applicationRepository, curator, flagSource, Duration.ofMinutes(1), interval); + super(applicationRepository, curator, flagSource, applicationRepository.clock().instant(), interval); this.hostedVespa = applicationRepository.configserverConfig().hostedVespa(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainer.java index 6a69665b8ad..7c01045ee72 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainer.java @@ -25,7 +25,7 @@ public class TenantsMaintainer extends ConfigServerMaintainer { TenantsMaintainer(ApplicationRepository applicationRepository, Curator curator, FlagSource flagSource, Duration interval, Clock clock) { - super(applicationRepository, curator, flagSource, interval, interval); + super(applicationRepository, curator, flagSource, applicationRepository.clock().instant(), interval); this.ttlForUnusedTenant = defaultTtlForUnusedTenant; this.clock = clock; } |