diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-09-09 13:42:46 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-09-09 13:42:46 +0200 |
| commit | 6d1f23fc3bc04d3b42779d10159845f1e864b379 (patch) | |
| tree | e64026e927f6cbaefc3ebc277b7091274522e5c4 /node-repository | |
| parent | 721e9545d86827c1808b37a58f25df1ee253bb51 (diff) | |
Simplify
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index f4424f65397..a37da10f5f0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -112,17 +112,15 @@ class NodeAllocation { if ( offered.state() == Node.State.active && allocation.isRemovable()) continue; // don't accept; causes removal if ( indexes.contains(membership.index())) continue; // duplicate index (just to be sure) - boolean wantToRetire = false; boolean resizeable = false; boolean acceptToRetire = false; if (requestedNodes.considerRetiring()) { - wantToRetire = shouldRetire(node); resizeable = node.isResizable; acceptToRetire = acceptToRetire(node); } if ((! saturated() && hasCompatibleFlavor(node) && requestedNodes.acceptable(offered)) || acceptToRetire) - accepted.add(acceptNode(node, wantToRetire, resizeable)); + accepted.add(acceptNode(node, shouldRetire(node), resizeable)); } else if (! saturated() && hasCompatibleFlavor(node)) { if ( ! nodeResourceLimits.isWithinRealLimits(offered, cluster)) { |