summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancer.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancer.java
index b490cdf4c24..8c9e54a2ae4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SwitchRebalancer.java
@@ -33,14 +33,13 @@ public class SwitchRebalancer extends NodeMover<Move> {
@Override
protected boolean maintain() {
- if ( ! nodeRepository().isWorking()) return false;
+ if (!nodeRepository().isWorking()) return false;
+ if (!nodeRepository().zone().environment().isProduction()) return true;
+ NodeList allNodes = nodeRepository().list(); // Lockless as strong consistency is not needed
+ if (!zoneIsStable(allNodes)) return true;
- boolean success = true;
- // Using node list without holding lock as strong consistency is not needed here
- NodeList allNodes = nodeRepository().list();
- if (!zoneIsStable(allNodes)) return success;
findBestMove(allNodes).execute(false, Agent.SwitchRebalancer, deployer, metric, nodeRepository());
- return success;
+ return true;
}
@Override