diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-04-14 10:00:19 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-04-14 10:00:19 +0200 |
commit | 4dffbb6339ca7ae1cee0d4a7ec40d960aac8abff (patch) | |
tree | 77b5d82a50c117d0b72196925fd2888829be7293 /node-repository | |
parent | fd9b726786f4c00b276f2d84fd0a3593a0c406eb (diff) |
Move all hosts to deprovisioned on deletion
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 2 | ||||
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index 41c7c1f5f1c..bde0343174a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -508,7 +508,7 @@ public class Nodes { if (node.type().isHost()) { List<Node> removed = removeChildren(node, force); - if (zone.getCloud().dynamicProvisioning() || node.type() != NodeType.host) + if (zone.getCloud().dynamicProvisioning()) db.removeNodes(List.of(node)); else { if (!node.status().wantToRebuild()) { // Keep IP addresses if we're rebuilding diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java index 1ec462b0620..f4cd5f5eeb5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import java.time.Duration; import java.time.Instant; +import java.util.List; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -36,14 +37,17 @@ public class NodeRepositoryTest { tester.addHost("id1", "host1", "default", NodeType.host); tester.addHost("id2", "host2", "default", NodeType.host); tester.addHost("id3", "host3", "default", NodeType.host); + tester.addHost("id4", "cfghost1", "default", NodeType.confighost); - assertEquals(3, tester.nodeRepository().nodes().list().size()); - - tester.nodeRepository().nodes().park("host2", true, Agent.system, "Parking to unit test"); - tester.nodeRepository().nodes().removeRecursively("host2"); + assertEquals(4, tester.nodeRepository().nodes().list().size()); + + for (var hostname : List.of("host2", "cfghost1")) { + tester.nodeRepository().nodes().park(hostname, true, Agent.system, "Parking to unit test"); + tester.nodeRepository().nodes().removeRecursively(hostname); + } - assertEquals(3, tester.nodeRepository().nodes().list().size()); - assertEquals(1, tester.nodeRepository().nodes().list(Node.State.deprovisioned).size()); + assertEquals(4, tester.nodeRepository().nodes().list().size()); + assertEquals(2, tester.nodeRepository().nodes().list(Node.State.deprovisioned).size()); } @Test |