diff options
author | Arnstein Ressem <aressem@gmail.com> | 2021-06-04 21:57:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-04 21:57:32 +0200 |
commit | cd1b747b4f65fa3a6ed6aace23235db7591638c5 (patch) | |
tree | 810ae8989030055b3cea65c684f69c0cfbd404b5 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java | |
parent | b14315a6f51bc8e5bce22e0d9d11d0e730aaf96d (diff) |
Revert "Emit a success factor from maintainers"
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java index 0589571e9d8..0307ae13b24 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java @@ -66,11 +66,12 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { } @Override - protected double maintain() { - if ( ! nodeRepository().nodes().isWorking()) return 0.0; + protected boolean maintain() { + if ( ! nodeRepository().nodes().isWorking()) return false; + boolean success = true; // Don't need to maintain spare capacity in dynamically provisioned zones; can provision more on demand. - if (nodeRepository().zone().getCloud().dynamicProvisioning()) return 1.0; + if (nodeRepository().zone().getCloud().dynamicProvisioning()) return success; NodeList allNodes = nodeRepository().nodes().list(); CapacityChecker capacityChecker = new CapacityChecker(allNodes); @@ -79,7 +80,6 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { metric.set("overcommittedHosts", overcommittedHosts.size(), null); retireOvercommitedHosts(allNodes, overcommittedHosts); - boolean success = true; Optional<CapacityChecker.HostFailurePath> failurePath = capacityChecker.worstCaseHostLossLeadingToFailure(); if (failurePath.isPresent()) { int spareHostCapacity = failurePath.get().hostsCausingFailure.size() - 1; @@ -96,7 +96,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { } metric.set("spareHostCapacity", spareHostCapacity, null); } - return success ? 1.0 : 0.0; + return success; } private boolean execute(List<Move> mitigation, CapacityChecker.HostFailurePath failurePath) { |