diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-06-20 10:47:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-20 10:47:24 +0200 |
commit | d097cb3bf2808bb05f2dc4fc2e7cf771246ba1a9 (patch) | |
tree | 5f0b99ba1f0d4f289b57656ac5f6a691df214cb3 /node-repository/src | |
parent | c1113c41bd63f46a7452b1baec2d142e03b2702e (diff) |
Revert "Allow deprovision of parked host & node w/alloc when node has wantToDeprovision"
Diffstat (limited to 'node-repository/src')
2 files changed, 1 insertions, 20 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java index a461d98697d..9c6eb2199f5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java @@ -204,7 +204,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer { .collect(Collectors.toMap(Node::hostname, Function.identity()))); nodes.stream() - .filter(node -> node.allocation().isPresent() && !node.status().wantToDeprovision()) + .filter(node -> node.allocation().isPresent()) .flatMap(node -> node.parentHostname().stream()) .distinct() .forEach(hostsByHostname::remove); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java index 451bcfb0b78..30d0f673fe1 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java @@ -574,25 +574,6 @@ public class DynamicProvisioningMaintainerTest { assertEquals(2, provisioningTester.activate(applicationId, prepared).size()); } - @Test - public void deprovision_parked_node_with_allocation() { - var tester = new DynamicProvisioningTester(); - tester.hostProvisioner.with(Behaviour.failProvisioning); - Node host4 = tester.addNode("host4", Optional.empty(), NodeType.host, Node.State.parked); - Node host41 = tester.addNode("host4-1", Optional.of("host4"), NodeType.tenant, Node.State.parked, DynamicProvisioningTester.tenantApp); - tester.nodeRepository.nodes().deprovision("host4", Agent.operator, Instant.now()); - - assertEquals(Optional.of(true), tester.nodeRepository.nodes().node("host4").map(n -> n.status().wantToDeprovision())); - assertEquals(Optional.of(Node.State.parked), tester.nodeRepository.nodes().node("host4").map(Node::state)); - assertEquals(Optional.of(true), tester.nodeRepository.nodes().node("host4-1").map(n -> n.status().wantToDeprovision())); - assertEquals(Optional.of(Node.State.parked), tester.nodeRepository.nodes().node("host4-1").map(Node::state)); - - tester.maintainer.maintain(); - - assertEquals(Optional.empty(), tester.nodeRepository.nodes().node("host4")); - assertEquals(Optional.empty(), tester.nodeRepository.nodes().node("host4-1")); - } - private void assertCfghost3IsActive(DynamicProvisioningTester tester) { assertEquals(5, tester.nodeRepository.nodes().list(Node.State.active).size()); assertEquals(3, tester.nodeRepository.nodes().list(Node.State.active).nodeType(NodeType.confighost).size()); |