diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-13 13:01:57 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-13 13:01:57 +0200 |
| commit | c220d939db429046e114307d972046b5b79efdf1 (patch) | |
| tree | 28cbe5cfd7f33a8568f90f45dec8887b89ed3051 /node-repository/src/main | |
| parent | b4b5b51eec0bf08855b6e62d65275deddae7decc (diff) | |
Allow child node to only be deleted in state ready
Diffstat (limited to 'node-repository/src/main')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 5 |
1 files changed, 2 insertions, 3 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 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<Node.State> legalStates = Arrays.asList(Node.State.provisioned, Node.State.failed, Node.State.parked, Node.State.ready); if (! legalStates.contains(nodeToRemove.state())) { |