diff options
| author | Jon Bratseth <bratseth@oath.com> | 2021-03-05 17:27:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 17:27:33 +0100 |
| commit | ba715525826666a104a6dd9914ae7582a784f4d7 (patch) | |
| tree | 3607136cb7d36f390a962d2d0080fe29c7fb749f /controller-server | |
| parent | 9f9de6abe48e9d727ab57f5ea668baf0c9e65f1c (diff) | |
| parent | c377170a5aad320c62b3a2bf73321aebe70c307a (diff) | |
Merge pull request #16822 from vespa-engine/jonmv/do-not-wait-for-reserved-nodes
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.java | 2 |
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()); |