diff options
3 files changed, 6 insertions, 9 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index c206105522f..eaeea794a28 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -43,7 +43,6 @@ environment string default="prod" region string default="default" system string default="main" zoneDnsSuffixes[] string -bootstrapping bool default=false # RPC protocol maxgetconfigclients int default=1000000 diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java index ba0f33cf6bd..5392df3d5b3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureProvisioner.java @@ -26,9 +26,9 @@ public class InfrastructureProvisioner extends NodeRepositoryMaintainer { this.infraDeployer = infraDeployer; } - public void maintain(boolean bootstrappingZone) { + public void maintainButThrowOnException() { try { - infraDeployer.activateAllSupportedInfraApplications(!bootstrappingZone); + infraDeployer.activateAllSupportedInfraApplications(true); } catch (RuntimeException e) { logger.log(Level.INFO, "Failed to deploy supported infrastructure applications, " + "will sleep 30s before propagating failure, to allow inspection of zk", diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index a3b43ced8d2..dac6ee61ef3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -1,9 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; -import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; +import com.yahoo.component.annotation.Inject; import com.yahoo.concurrent.maintenance.Maintainer; import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.HostLivenessTracker; @@ -37,7 +36,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { HostLivenessTracker hostLivenessTracker, ServiceMonitor serviceMonitor, Zone zone, Metric metric, ProvisionServiceProvider provisionServiceProvider, FlagSource flagSource, - MetricsFetcher metricsFetcher, ConfigserverConfig configserverConfig) { + MetricsFetcher metricsFetcher) { DefaultTimes defaults = new DefaultTimes(zone, deployer); PeriodicApplicationMaintainer periodicApplicationMaintainer = new PeriodicApplicationMaintainer(deployer, metric, nodeRepository, defaults.redeployMaintainerInterval, @@ -76,9 +75,8 @@ public class NodeRepositoryMaintenance extends AbstractComponent { provisionServiceProvider.getHostProvisioner() .map(hostProvisioner -> new HostRetirer(nodeRepository, defaults.hostRetirerInterval, metric, hostProvisioner)) .ifPresent(maintainers::add); - // The DuperModel is filled with infrastructure applications by the infrastructure provisioner, so explicitly - // run that now to ensure the release rollout halts on error. - infrastructureProvisioner.maintain(configserverConfig.bootstrapping()); + // The DuperModel is filled with infrastructure applications by the infrastructure provisioner, so explicitly run that now + infrastructureProvisioner.maintainButThrowOnException(); } @Override |