aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-02-26 21:27:17 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-02-26 21:27:17 +0100
commit97589e64669331dbbb7deef33caf99afe0f0f560 (patch)
tree65f6a0038eb8cd4d3edd61dc90164fe2ddf69e99 /node-repository
parentba131f00cf4b0e8196ad887104af9024832126da (diff)
Force removal
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostDeprovisionMaintainer.java2
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);
}