summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-03-05 17:26:11 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-03-05 17:26:11 +0100
commitc377170a5aad320c62b3a2bf73321aebe70c307a (patch)
tree49a4a5e2340bebdc3d05db5ae9b51a28d6b52723 /controller-server
parentcf288e59fddb5a1a8ad2430a10f820068a61d120 (diff)
Do not wait for reserved nodes to converge, because they will not
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 77aefc90481..e1587d250ec 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -299,7 +299,7 @@ public class InternalStepRunner implements StepRunner {
}
List<Node> nodes = controller.serviceRegistry().configServer().nodeRepository().list(id.type().zone(controller.system()),
id.application(),
- ImmutableSet.of(active, reserved));
+ Set.of(active));
List<Node> parents = controller.serviceRegistry().configServer().nodeRepository().list(id.type().zone(controller.system()),
nodes.stream().map(node -> node.parentHostname().get()).collect(toList()));
NodeList nodeList = NodeList.of(nodes, parents, services.get());