Only consider non-retired node when determining number of groups/cluster size

1 files changed, 3 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
index c7182571f31..9b0f0111b5d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
@@ -60,7 +60,8 @@ public class NodePrioritizer {
         this.spareHosts = findSpareHosts(allNodes, capacity, spares);
 
         NodeList nodesInCluster = allNodes.owner(appId).type(clusterSpec.type()).cluster(clusterSpec.id());
-        long currentGroups = nodesInCluster.state(Node.State.active).stream()
+        NodeList nonRetiredNodesInCluster = nodesInCluster.not().retired();
+        long currentGroups = nonRetiredNodesInCluster.state(Node.State.active).stream()
                 .flatMap(node -> node.allocation()
                         .flatMap(alloc -> alloc.membership().cluster().group().map(ClusterSpec.Group::index))
                         .stream())
@@ -68,7 +69,7 @@ public class NodePrioritizer {
                 .count();
         this.isTopologyChange = currentGroups != wantedGroups;
 
-        this.currentClusterSize = (int) nodesInCluster.state(Node.State.active).stream()
+        this.currentClusterSize = (int) nonRetiredNodesInCluster.state(Node.State.active).stream()
                 .map(node -> node.allocation().flatMap(alloc -> alloc.membership().cluster().group()))
                 .filter(clusterSpec.group()::equals)
                 .count();