diff options
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java index 5eb0f830ef6..372b7a44a0b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java @@ -10,6 +10,7 @@ import com.yahoo.config.provision.Deployment; import com.yahoo.config.provision.TransientException; import com.yahoo.container.handler.VipStatus; import com.yahoo.container.jdisc.state.StateMonitor; +import com.yahoo.vespa.config.server.filedistribution.FileDirectory; import com.yahoo.vespa.config.server.maintenance.ConfigServerMaintenance; import com.yahoo.vespa.config.server.rpc.RpcServer; import com.yahoo.vespa.config.server.version.VersionState; @@ -71,14 +72,16 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable @SuppressWarnings("unused") // Injected component @Inject public ConfigServerBootstrap(ApplicationRepository applicationRepository, RpcServer server, - VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus) { - this(applicationRepository, server, versionState, stateMonitor, vipStatus, EXIT_JVM, vipStatusMode(applicationRepository)); + VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus, + FileDirectory fileDirectory) { + this(applicationRepository, server, versionState, stateMonitor, vipStatus, EXIT_JVM, + vipStatusMode(applicationRepository), fileDirectory); } protected ConfigServerBootstrap(ApplicationRepository applicationRepository, RpcServer server, VersionState versionState, StateMonitor stateMonitor, VipStatus vipStatus, RedeployingApplicationsFails exitIfRedeployingApplicationsFails, - VipStatusMode vipStatusMode) { + VipStatusMode vipStatusMode, FileDirectory fileDirectory) { this.applicationRepository = applicationRepository; this.server = server; this.versionState = versionState; @@ -90,7 +93,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable this.exitIfRedeployingApplicationsFails = exitIfRedeployingApplicationsFails; this.clock = applicationRepository.clock(); rpcServerExecutor = Executors.newSingleThreadExecutor(new DaemonThreadFactory("config server RPC server")); - configServerMaintenance = new ConfigServerMaintenance(applicationRepository); + configServerMaintenance = new ConfigServerMaintenance(applicationRepository, fileDirectory); configServerMaintenance.startBeforeBootstrap(); log.log(Level.FINE, () -> "VIP status mode: " + vipStatusMode); initializing(vipStatusMode); |