diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-24 10:37:22 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-02-24 10:37:22 +0100 |
| commit | 058e220c9f3e45820df5e06463edf3ad7ae24021 (patch) | |
| tree | 46fc8e7a0b18c7447102044f471a1daf9eef352b /node-repository | |
| parent | 515c4ff32934e98fef121c7388f2f3703f09d897 (diff) | |
There is already a call to maintain - unify
Diffstat (limited to 'node-repository')
2 files changed, 3 insertions, 3 deletions
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 cc352cc567f..4d04409aaf0 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 @@ -23,9 +23,9 @@ public class InfrastructureProvisioner extends Maintainer { InfrastructureProvisioner(NodeRepository nodeRepository, InfraDeployer infraDeployer, Duration interval) { super(nodeRepository, interval); this.infraDeployer = infraDeployer; + } - // If this fails, we fail the component graph construction and bootstrap of config server, - // which is what we want. + public void maintainButThrowOnException() { try { infraDeployer.activateAllSupportedInfraApplications(true); } catch (RuntimeException e) { 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 063b5ad2c2a..37620e17a95 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 @@ -87,7 +87,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { rebalancer = new Rebalancer(deployer, nodeRepository, provisionServiceProvider.getHostResourcesCalculator(), provisionServiceProvider.getHostProvisioner(), metric, clock, defaults.rebalancerInterval); // The DuperModel is filled with infrastructure applications by the infrastructure provisioner, so explicitly run that now - infrastructureProvisioner.maintain(); + infrastructureProvisioner.maintainButThrowOnException(); } @Override |