diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-04-12 10:58:54 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-04-12 10:58:54 +0200 |
| commit | 67ec9d4864c94ab5c90d2232d76fab5e82a9fcfa (patch) | |
| tree | 1ad8f451f0de5cf467b486276ceb92a5a0034007 /controller-server | |
| parent | 32db7b3891c9b0b39af89a3764e14809683f431c (diff) | |
Ignore unknown impacted hosts
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java index a84d1c3ad7e..95432e3acbc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java @@ -104,7 +104,7 @@ public class ChangeManagementAssessor { private List<String> toParentHosts(List<String> impactedHostnames, List<NodeRepositoryNode> allNodes) { return impactedHostnames.stream() - .map(hostname -> + .flatMap(hostname -> allNodes.stream() .filter(node -> List.of(NodeType.config, NodeType.proxy, NodeType.host).contains(node.getType())) .filter(node -> hostname.equals(node.getHostname()) || hostname.equals(node.getParentHostname())) @@ -112,7 +112,7 @@ public class ChangeManagementAssessor { if (node.getType() == NodeType.host) return node.getHostname(); return node.getParentHostname(); - }).findFirst().orElseThrow() + }).findFirst().stream() ) .collect(Collectors.toList()); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessorTest.java index 575a38cd637..476d2465202 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessorTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessorTest.java @@ -69,7 +69,7 @@ public class ChangeManagementAssessorTest { @Test public void one_of_two_groups_in_one_of_two_clusters() { ZoneId zone = ZoneId.from("prod", "eu-trd"); - List<String> hostNames = Arrays.asList("host1", "host2"); + List<String> hostNames = Arrays.asList("host1", "host2", "host5"); List<NodeRepositoryNode> allNodesInZone = new ArrayList<>(); // Two impacted nodes on host1 |