You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/03/12 23:45:06 UTC
svn commit: r1576975 -
/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Author: enis
Date: Wed Mar 12 22:45:06 2014
New Revision: 1576975
URL: http://svn.apache.org/r1576975
Log:
HBASE-10620 LoadBalancer.needsBalance() should check for co-located region replicas as well (Addendum patch to fix return value from balance() call)
Modified:
hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1576975&r1=1576974&r2=1576975&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Wed Mar 12 22:45:06 2014
@@ -1435,7 +1435,6 @@ 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;
@@ -1479,7 +1478,6 @@ 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);
@@ -1507,7 +1505,9 @@ 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;
}
@Override