HBASE-10620 LoadBalancer.needsBalance() should check for co-located region replicas as well (Addendum patch to fix return value from balance() call)
git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-10070@1576975 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fa68470f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa68470f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa68470f Branch: refs/heads/master Commit: fa68470fe656d2adbda31767908e37da3aa9fc7c Parents: d723115 Author: Enis Soztutar <[email protected]> Authored: Wed Mar 12 22:45:06 2014 +0000 Committer: Enis Soztutar <[email protected]> Committed: Fri Jun 27 16:39:38 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fa68470f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 226ab55..f06948e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -954,7 +954,6 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } // Do this call outside of synchronized block. int maximumBalanceTime = getBalancerCutoffTime(); - boolean balancerRan; synchronized (this.balancer) { // If balance not true, don't run balancer. if (!this.loadBalancerTracker.isBalancerOn()) return false; @@ -998,7 +997,6 @@ public class HMaster extends HRegionServer implements MasterServices, Server { long cutoffTime = System.currentTimeMillis() + maximumBalanceTime; int rpCount = 0; // number of RegionPlans balanced so far long totalRegPlanExecTime = 0; - balancerRan = plans.size() != 0; if (plans != null && !plans.isEmpty()) { for (RegionPlan plan: plans) { LOG.info("balance " + plan); @@ -1026,7 +1024,9 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } } } - return balancerRan; + // If LoadBalancer did not generate any plans, it means the cluster is already balanced. + // Return true indicating a success. + return true; } /**
