diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-12-04 14:38:57 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-12-04 14:38:57 +0100 |
commit | a41f138390a8c57ba5420abb2a6291a76adfe2ba (patch) | |
tree | 2ff608fd3a01bae04f52be26cb089c2ea62747ce | |
parent | 3c77a8729ed4dd98d73e3a1c9b9f7bdc711a5f40 (diff) |
Provision infrastructure nodes ASAP on bootstrap
2 files changed, 6 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java index c0dc7e8a9ae..9d558a9c2a2 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java @@ -63,8 +63,10 @@ public class StateMonitor extends AbstractComponent { } public void status(Status status) { - log.log(LogLevel.INFO, "Changing health status code from '" + this.status + "' to '" + status.name() + "'"); - this.status = status; + if (status != this.status) { + log.log(LogLevel.INFO, "Changing health status code from '" + this.status + "' to '" + status.name() + "'"); + this.status = status; + } } public Status status() { return status; } 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 ded19a84f0d..2bcf3beda15 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 @@ -83,6 +83,8 @@ public class NodeRepositoryMaintenance extends AbstractComponent { metricsReporter = new MetricsReporter(nodeRepository, metric, orchestrator, serviceMonitor, periodicApplicationMaintainer::pendingDeployments, durationFromEnv("metrics_interval").orElse(defaults.metricsInterval), jobControl); infrastructureProvisioner = new InfrastructureProvisioner(provisioner, nodeRepository, infrastructureVersions, durationFromEnv("infrastructure_provision_interval").orElse(defaults.infrastructureProvisionInterval), jobControl); + // The DuperModel is filled with infrastructure applications by the infrastructure provisioner, so explicitly run that now + infrastructureProvisioner.maintain(); RetirementPolicy policy = new RetirementPolicyList(new RetireIPv4OnlyNodes(zone)); FlavorSpareChecker flavorSpareChecker = new FlavorSpareChecker( |