diff options
author | jonmv <venstad@gmail.com> | 2023-05-30 14:42:49 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-05-30 14:42:49 +0200 |
commit | 0df5c9b2830dea798df952c5949e5346dcbd514e (patch) | |
tree | bf2acbff077db508b83791a20454c7f9984de6e0 /node-repository/src/main/java | |
parent | 84dd006054d1583df0313e81cc697fc91eedee61 (diff) |
Address review
Diffstat (limited to 'node-repository/src/main/java')
2 files changed, 2 insertions, 22 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java index f3b76537463..1533780e694 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java @@ -131,7 +131,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer { if (expired && canRemoveHost(emptyHost)) { // Retire the host to parked if possible, otherwise move it straight to parked. if (EnumSet.of(Node.State.reserved, Node.State.active, Node.State.inactive).contains(host.state())) { - emptyHost = emptyHost.withWantToRetire(true, true, Agent.HostCapacityMaintainer, nodeRepository().clock().instant()); + emptyHost = emptyHost.withWantToRetire(true, true, Agent.HostCapacityMaintainer, now); nodeRepository().nodes().write(emptyHost, lock); } else { @@ -163,26 +163,6 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer { .toList(); } - /** - * Excess hosts that can safely be deprovisioned: An excess host 1. contains no nodes allocated - * to an application, and assuming the spare nodes have been allocated, and 2. is not parked - * without wantToDeprovision (which means an operator is looking at the node). - */ - private static List<Node> candidatesForRemoval(List<Node> nodes) { - Map<String, Node> removableHostsByHostname = new HashMap<>(); - for (var node : nodes) { - if (canRemoveHost(node)) { - removableHostsByHostname.put(node.hostname(), node); - } - } - for (var node : nodes) { - if (node.parentHostname().isPresent() && !canDeprovision(node)) { - removableHostsByHostname.remove(node.parentHostname().get()); - } - } - return List.copyOf(removableHostsByHostname.values()); - } - private static boolean canRemoveHost(Node host) { return switch (host.type()) { // TODO: Mark empty tenant hosts as wanttoretire & wanttodeprovision elsewhere, then handle as confighost here 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 265040823b2..1d4ab5fc09c 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 @@ -155,7 +155,7 @@ public class NodePrioritizer { } private boolean fitsPerfectly(Node host) { - return requestedNodes.resources().get().compatibleWith(host.resources()); + return host.resources().compatibleWith(requestedNodes.resources().get()); } /** Add existing nodes allocated to the application */ |