From c220d939db429046e114307d972046b5b79efdf1 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Wed, 13 Sep 2017 13:01:57 +0200 Subject: Allow child node to only be deleted in state ready --- .../main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'node-repository/src/main') 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 6d04685189f..92f52155edf 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 @@ -529,14 +529,13 @@ public class NodeRepository extends AbstractComponent { * If also removing the parent node: child is in state provisioned|failed|parked|ready */ private boolean verifyRemovalIsAllowed(Node nodeToRemove, boolean deletingAsChild) { - // TODO: Enable once controller no longer deletes child nodes manually - /*if (nodeToRemove.flavor().getType() == Flavor.Type.DOCKER_CONTAINER && !deletingAsChild) { + if (nodeToRemove.flavor().getType() == Flavor.Type.DOCKER_CONTAINER && !deletingAsChild) { if (nodeToRemove.state() != Node.State.ready) { throw new IllegalArgumentException( String.format("Docker container node %s can only be removed when in state ready", nodeToRemove.hostname())); } - } else */ if (nodeToRemove.flavor().getType() == Flavor.Type.DOCKER_CONTAINER) { + } else if (nodeToRemove.flavor().getType() == Flavor.Type.DOCKER_CONTAINER) { List legalStates = Arrays.asList(Node.State.provisioned, Node.State.failed, Node.State.parked, Node.State.ready); if (! legalStates.contains(nodeToRemove.state())) { -- cgit v1.2.3