diff options
3 files changed, 2 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java index 2a6db1ffe6e..cbc5a44ae94 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java @@ -146,11 +146,6 @@ public class NodeList extends AbstractFilteringList<Node, NodeList> { return matching(node -> nodeStates.contains(node.state())); } - /** Returns the subset of nodes in the active state */ - public NodeList active() { - return matching(node -> node.state()== Node.State.active); - } - /** Returns the subset of nodes which wantToRetire set true */ public NodeList wantToRetire() { return matching((node -> node.status().wantToRetire())); 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 a7c1517deb5..54899372397 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 @@ -244,7 +244,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { } for (Move move : moves) { if ( ! move.fromHost().equals(host)) continue; - resources = resources.add(move.fromHost().resources()); + resources = resources.add(move.node().resources()); } return resources; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java index 95f98a351a1..ae3d6ebf815 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java @@ -179,7 +179,7 @@ public class MockDeployer implements Deployer { redeployments++; lastDeployTimes.put(applicationId, clock.instant()); - for (Node node : nodeRepository.list().owner(applicationId).active().wantToRetire().asList()) + for (Node node : nodeRepository.list().owner(applicationId).state(Node.State.active).wantToRetire().asList()) nodeRepository.write(node.retire(nodeRepository.clock().instant()), nodeRepository.lock(node)); } |