diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2018-12-04 19:20:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 19:20:35 +0100 |
| commit | 0daac4e48cea934f1849d5be486c8506641214b6 (patch) | |
| tree | 37953830c2932e18894d47181347a2b3401a05a7 | |
| parent | 120ca2632951acf181441be3b34356ce02ccbda2 (diff) | |
| parent | a41f138390a8c57ba5420abb2a6291a76adfe2ba (diff) | |
Merge pull request #7864 from vespa-engine/hakonhall/provision-infrastructure-nodes-asap-on-bootstrap
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 677288009da..82fc5df7ce4 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 @@ -85,6 +85,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, duperModelInfraApi); + // 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( |