summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2021-08-17 16:35:58 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2021-08-17 16:35:58 +0200
commit7757e3ae733e847e45afe2c971696379372734d8 (patch)
tree6508583c9d1b4a337df14298f24e307722057e95 /node-repository
parent662ab0f5f14f85e5bf7b5d9d50e047aa1da94657 (diff)
Simplify condition for triggering routing redeploy
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
index e5cfd4e9676..57b726764ac 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ExpeditedChangeApplicationMaintainer.java
@@ -53,13 +53,9 @@ public class ExpeditedChangeApplicationMaintainer extends ApplicationMaintainer
.map(Map.Entry::getKey)
.forEach(applications::add);
- // A ready proxy node should trigger a redeployment as it will activates the ready node.
- ApplicationId proxyApplicationId = ApplicationId.from("hosted-vespa", "routing", "default");
- if (!applications.contains(proxyApplicationId)) {
- NodeList readyProxyNodes = nodeRepository().nodes().list(Node.State.ready).nodeType(NodeType.proxy);
- if (hasBeenReadied(proxyApplicationId, readyProxyNodes)) {
- applications.add(proxyApplicationId);
- }
+ // A ready proxy node should trigger a redeployment as it will activate the node.
+ if (!nodeRepository().nodes().list(Node.State.ready, Node.State.reserved).nodeType(NodeType.proxy).isEmpty()) {
+ applications.add(ApplicationId.from("hosted-vespa", "routing", "default"));
}
return applications;