diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-10-28 11:15:01 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-10-28 11:19:42 +0200 |
commit | 56907fe7dab5bab3ec09d96c5b23e4ba1c4ba0b6 (patch) | |
tree | f9541b0bf4f630d1d7c9c114fe347df6142fc2bf /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | |
parent | 365e3b9780aa02cf9955e384f5eed90e01ee1e86 (diff) |
Never offer hosts in wrong account
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index 56038ff1fe9..fe634a77997 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -122,6 +122,7 @@ class NodeAllocation { if ( candidate.state() == Node.State.active && candidate.wantToFail()) continue; // don't accept; causes failing if ( indexes.contains(membership.index())) continue; // duplicate index (just to be sure) if ( requiredHostFlavor.isPresent() && ! candidate.parent.map(node -> node.flavor().name()).equals(requiredHostFlavor)) continue; + if ( candidate.parent.isPresent() && ! candidate.parent.get().cloudAccount().equals(requestedNodes.cloudAccount())) continue; // wrong account boolean resizeable = requestedNodes.considerRetiring() && candidate.isResizable; boolean acceptToRetire = acceptToRetire(candidate); |