summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-09-11 09:52:02 +0200
committerHarald Musum <musum@verizonmedia.com>2020-09-11 09:52:02 +0200
commitc6cecc2303637abe3da54be197414b9cbb6368f1 (patch)
treef6839a5160d0b4f51c7e4c2777308d54713ee4b2
parentf99747530354a544cad53de866620a5fd1876763 (diff)
Do not start config server maintainers until bootstrapping is done
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java7
1 files 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,