From c6cecc2303637abe3da54be197414b9cbb6368f1 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 11 Sep 2020 09:52:02 +0200 Subject: Do not start config server maintainers until bootstrapping is done --- .../vespa/config/server/maintenance/ConfigServerMaintenance.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 9f2d6d178be..c5d3d6f72f4 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 @@ -6,6 +6,7 @@ import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.config.server.ApplicationRepository; +import com.yahoo.vespa.config.server.ConfigServerBootstrap; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.flags.FlagSource; @@ -15,7 +16,8 @@ import java.time.Duration; /** * 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. + * and running its own dedicated thread. {@link ConfigServerBootstrap} is injected into this class, so + * no maintainers will run until bootstrapping is done * * @author hmusum */ @@ -27,7 +29,8 @@ public class ConfigServerMaintenance extends AbstractComponent { private final ApplicationPackageMaintainer applicationPackageMaintainer; @Inject - public ConfigServerMaintenance(ConfigserverConfig configserverConfig, + public ConfigServerMaintenance(ConfigServerBootstrap configServerBootstrap, + ConfigserverConfig configserverConfig, ApplicationRepository applicationRepository, Curator curator, FlagSource flagSource, -- cgit v1.2.3