summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2019-10-17 21:15:56 +0200
committerGitHub <noreply@github.com>2019-10-17 21:15:56 +0200
commitfe339a813ef41dee606b52a26d75211c84053761 (patch)
tree0a65db84c7b15ea390aa79694ac73ab8b59d3695
parent80688613dc3c90fb9b9a10976bd492a428764174 (diff)
parentd74c042a60612a580731334142785ff89ae33a94 (diff)
Merge pull request #11011 from vespa-engine/bratseth/balance-tenant-nodes-only
Only consider tenant nodes
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java4
1 files changed, 2 insertions, 2 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 42b51f521bc..5698d13e33c 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
@@ -55,9 +55,9 @@ public class Rebalancer extends Maintainer {
private Move findBestMove(NodeList allNodes) {
DockerHostCapacity capacity = new DockerHostCapacity(allNodes, hostResourcesCalculator);
Move bestMove = Move.none;
- for (Node node : allNodes.state(Node.State.active)) {
+ for (Node node : allNodes.nodeType(NodeType.tenant).state(Node.State.active)) {
if (node.parentHostname().isEmpty()) continue;
- for (Node toHost : allNodes.state(NodePrioritizer.ALLOCATABLE_HOST_STATES).nodeType(NodeType.host)) {
+ 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;