diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2023-08-28 13:15:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 13:15:20 +0200 |
| commit | 253b88d85ee0405fa477c449fee14d906ad821b6 (patch) | |
| tree | d63df9f31feefa37cfe9575a657a73f18c4b7046 | |
| parent | 62e5fd3d804901ae46b3ef7a796ecdd56b4196c5 (diff) | |
| parent | 1b6fbe21c443840080c819a2687ce73ee0fc55fb (diff) | |
Merge pull request #28177 from vespa-engine/freva/fix-alloc
Exclude host in different cloud accounts from consideration early
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java | 1 |
1 files changed, 1 insertions, 0 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 4ac90753ed1..24cf86e8a25 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 @@ -128,6 +128,7 @@ public class NodePrioritizer { if (spareHosts.contains(host) && !canAllocateToSpareHosts) continue; if ( ! capacity.hasCapacity(host, requested.resources().get())) continue; if ( ! allNodes.childrenOf(host).owner(application).cluster(clusterSpec.id()).isEmpty()) continue; + if ( ! requested.cloudAccount().isUnspecified() && ! requested.cloudAccount().equals(host.cloudAccount())) continue; candidates.add(NodeCandidate.createNewChild(requested.resources().get(), capacity.availableCapacityOf(host), |