diff options
author | Harald Musum <musum@yahooinc.com> | 2022-12-19 14:06:09 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-12-19 14:06:09 +0100 |
commit | 30301a7a53cdf697b81d320980c3489ce644f998 (patch) | |
tree | 97ee3877db80af8cb57f9f04a6f8b3c202be1cb4 /configserver | |
parent | 7b265f56441a2c6107e01e78082d3f1f26883b0b (diff) |
Simplify and update javadoc
Diffstat (limited to 'configserver')
2 files changed, 5 insertions, 25 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java index 3adda08b9aa..7dda3d4e462 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java @@ -1,15 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.maintenance; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.concurrent.maintenance.Maintainer; import com.yahoo.vespa.config.server.ApplicationRepository; -import com.yahoo.vespa.config.server.ConfigServerBootstrap; import com.yahoo.vespa.config.server.application.ConfigConvergenceChecker; import com.yahoo.vespa.config.server.filedistribution.FileDirectory; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.flags.FlagSource; - import java.time.Clock; import java.time.Duration; import java.util.List; @@ -18,40 +15,38 @@ import java.util.concurrent.CopyOnWriteArrayList; /** * Maintenance jobs of the config server. * Each maintenance job is a singleton instance of its implementing class, created and owned by this, - * and running its own dedicated thread. {@link ConfigServerBootstrap} is injected into this class, so - * no maintainers will run until bootstrapping is done + * and running its own dedicated thread. * * @author hmusum */ public class ConfigServerMaintenance { private final List<Maintainer> maintainers = new CopyOnWriteArrayList<>(); - private final ConfigserverConfig configserverConfig; private final ApplicationRepository applicationRepository; private final Curator curator; private final FlagSource flagSource; private final ConfigConvergenceChecker convergenceChecker; private final FileDirectory fileDirectory; + private final Duration interval; public ConfigServerMaintenance(ApplicationRepository applicationRepository, FileDirectory fileDirectory) { - this.configserverConfig = applicationRepository.configserverConfig(); this.applicationRepository = applicationRepository; this.curator = applicationRepository.tenantRepository().getCurator(); this.flagSource = applicationRepository.flagSource(); this.convergenceChecker = applicationRepository.configConvergenceChecker(); this.fileDirectory = fileDirectory; + this.interval = Duration.ofMinutes(applicationRepository.configserverConfig().maintainerIntervalMinutes()); } public void startBeforeBootstrap() { maintainers.add(new ApplicationPackageMaintainer(applicationRepository, curator, Duration.ofSeconds(30), flagSource)); - maintainers.add(new TenantsMaintainer(applicationRepository, curator, flagSource, - new DefaultTimes(configserverConfig).defaultInterval, Clock.systemUTC())); + maintainers.add(new TenantsMaintainer(applicationRepository, curator, flagSource, interval, Clock.systemUTC())); } public void startAfterBootstrap() { maintainers.add(new FileDistributionMaintainer(applicationRepository, curator, - new DefaultTimes(configserverConfig).defaultInterval, + interval, flagSource, fileDirectory)); maintainers.add(new SessionsMaintainer(applicationRepository, curator, Duration.ofSeconds(30), flagSource)); @@ -66,17 +61,4 @@ public class ConfigServerMaintenance { public List<Maintainer> maintainers() { return List.copyOf(maintainers); } - /* - * Default values from config. If one of the values needs to be changed, add the value to - * configserver-config.xml in the config server application directory and restart the config server - */ - private static class DefaultTimes { - - private final Duration defaultInterval; - - DefaultTimes(ConfigserverConfig configserverConfig) { - this.defaultInterval = Duration.ofMinutes(configserverConfig.maintainerIntervalMinutes()); - } - } - } 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 42a037344a8..83c3549c3bf 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 @@ -18,7 +18,6 @@ import java.time.Duration; */ public class FileDistributionMaintainer extends ConfigServerMaintainer { - private final ApplicationRepository applicationRepository; private final FileDirectory fileDirectory; private final Duration maxUnusedFileReferenceAge; @@ -28,7 +27,6 @@ public class FileDistributionMaintainer extends ConfigServerMaintainer { FlagSource flagSource, FileDirectory fileDirectory) { super(applicationRepository, curator, flagSource, applicationRepository.clock(), interval, false); - this.applicationRepository = applicationRepository; ConfigserverConfig configserverConfig = applicationRepository.configserverConfig(); this.maxUnusedFileReferenceAge = Duration.ofMinutes(configserverConfig.keepUnusedFileReferencesMinutes()); this.fileDirectory = fileDirectory; |