diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-02-27 09:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 09:17:33 +0100 |
| commit | 56f42da9139d39e60cfcabea7a051cbb6186a661 (patch) | |
| tree | 13ef5b6a2cf915acc4a0fc710242b5247bc56175 /node-repository | |
| parent | cd6833326d4d4c1b8a37fb3f1b772ad957f236fc (diff) | |
| parent | 97589e64669331dbbb7deef33caf99afe0f0f560 (diff) | |
Merge pull request #8621 from vespa-engine/freva/force-removal
Force removal of nodes
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index bc2e729b791..c632839ddf3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -558,7 +558,7 @@ public class NodeRepository extends AbstractComponent { return removeRecursively(node, false); } - private List<Node> removeRecursively(Node node, boolean force) { + public List<Node> removeRecursively(Node node, boolean force) { try (Mutex lock = lockAllocation()) { List<Node> removed = new ArrayList<>(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostDeprovisionMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostDeprovisionMaintainer.java index becad405415..7e22245316a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostDeprovisionMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostDeprovisionMaintainer.java @@ -46,7 +46,7 @@ public class HostDeprovisionMaintainer extends Maintainer { for (Node node : candidates(nodes)) { try { hostProvisioner.deprovision(node); - nodeRepository().removeRecursively(node.hostname()); + nodeRepository().removeRecursively(node, true); } catch (RuntimeException e) { log.log(Level.WARNING, "Failed to deprovision " + node.hostname() + ", will retry in " + interval(), e); } |