diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-06-10 12:42:51 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-06-10 12:42:51 +0200 |
| commit | 49ad958565e4db19872bfb1a069a0209a652c011 (patch) | |
| tree | 87ae37bfaa752aefc8452ee8611e32f4adb15d85 /node-repository | |
| parent | 7f55a0f05ea9ab8d684e278f832a175ab543b9df (diff) | |
Nonfunctional changes only
Diffstat (limited to 'node-repository')
2 files changed, 4 insertions, 3 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 05bfac47fb9..4f7902d4dbc 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 @@ -62,7 +62,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { if (failurePath.isPresent()) { int worstCaseHostLoss = failurePath.get().hostsCausingFailure.size(); metric.set("spareHostCapacity", worstCaseHostLoss - 1, null); - if (worstCaseHostLoss <= 1) { + if (worstCaseHostLoss == 1) { // Try to get back to needing 2 hosts to fail in the worst case Optional<Node> moveCandidate = identifyMoveCandidate(failurePath.get()); if (moveCandidate.isPresent()) move(moveCandidate.get()); @@ -71,7 +71,8 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { } private Optional<Node> identifyMoveCandidate(CapacityChecker.HostFailurePath failurePath) { - return Optional.empty(); + Node host = failurePath.hostsCausingFailure.get(0); + } private void move(Node node) { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 8a15c058ff4..5e297900767 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -206,7 +206,7 @@ public class NodePrioritizer { builder.parent(parent).freeParentCapacity(parentCapacity); if (!isNewNode) - builder.resizable(!allocateFully + builder.resizable(! allocateFully && requestedNodes.canResize(node.flavor().resources(), parentCapacity, isTopologyChange, currentClusterSize)); if (spareHosts.contains(parent)) |