diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-01-17 14:35:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-17 14:35:28 +0100 |
commit | 5d5f6c553a3f7c127429282322f1f7c7d2ec4081 (patch) | |
tree | dd6f7d7457dbb885338e5a312b5780fa3eb5139d /node-repository | |
parent | ca80f4634d471c078047337e1d10a7f73c163900 (diff) | |
parent | bdf5c7732c8f9ee13f8973f83ba2471029518f48 (diff) |
Merge pull request #11824 from vespa-engine/freva/do-not-count-retired
Only consider non-retired node when determining number of groups/cluster size
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java | 5 |
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 b8d7ff04efa..a17d92117fb 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 @@ -63,7 +63,8 @@ public class NodePrioritizer { this.inPlaceResizeEnabled = inPlaceResizeEnabled; 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()) @@ -71,7 +72,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(); |