diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-11-19 14:21:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-19 14:21:24 +0100 |
commit | 04a0464feb82b2e3484bbffaa502093e41566096 (patch) | |
tree | 64f1f1d56b93cd1e77d4da7e655a40b203ff9896 | |
parent | d2fbdd5b1798390c0fec4abaead082630db57c77 (diff) | |
parent | a65f60b1e3ace95945de55e3217a6f96fbe6a35f (diff) |
Merge pull request #11354 from vespa-engine/revert-11353-revert-11347-jvenstad/do-not-rebalance-tester-nodes
Revert "Revert "Skip tester owned nodes when considering best moves""
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java index ffc4461af51..7d8949502d4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java @@ -99,6 +99,7 @@ public class Rebalancer extends Maintainer { Move bestMove = Move.none; for (Node node : allNodes.nodeType(NodeType.tenant).state(Node.State.active)) { if (node.parentHostname().isEmpty()) continue; + if (node.allocation().get().owner().instance().isTester()) continue; for (Node toHost : allNodes.nodeType(NodeType.host).state(NodePrioritizer.ALLOCATABLE_HOST_STATES)) { if (toHost.hostname().equals(node.parentHostname().get())) continue; if ( ! capacity.freeCapacityOf(toHost).satisfies(node.flavor().resources())) continue; |