Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22403 Balance in RSGroup should consider throttling and a failure affects the whole 

Signed-off-by: Guanghao Zhang <zghao@apache.org>
This commit is contained in:
haxiaolin 2019-06-27 10:52:01 +08:00 committed by Guanghao Zhang
parent be432b7c45
commit a4738e5184
4 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java
View File

@ -409,7 +409,6 @@ public class RSGroupAdminServer implements RSGroupAdmin {
@Override
public boolean balanceRSGroup(String groupName) throws IOException {
ServerManager serverManager = master.getServerManager();
AssignmentManager assignmentManager = master.getAssignmentManager();
LoadBalancer balancer = master.getLoadBalancer();
synchronized (balancer) {
@ -447,16 +446,11 @@ public class RSGroupAdminServer implements RSGroupAdmin {
plans.addAll(partialPlans);
}
}
long startTime = System.currentTimeMillis();
boolean balancerRan = !plans.isEmpty();
if (balancerRan) {
LOG.info("RSGroup balance {} starting with plan count: {}", groupName, plans.size());
for (RegionPlan plan: plans) {
LOG.info("balance {}", plan);
assignmentManager.moveAsync(plan);
}
LOG.info("RSGroup balance {} completed after {} seconds", groupName,
(System.currentTimeMillis() - startTime));
master.executeRegionPlansWithThrottling(plans);
LOG.info("RSGroup balance " + groupName + " completed");
}
return balancerRan;
}

34
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -1672,7 +1672,6 @@ public class HMaster extends HRegionServer implements MasterServices {
return false;
}
int maxRegionsInTransition = getMaxRegionsInTransition();
synchronized (this.balancer) {
// If balance not true, don't run balancer.
if (!this.loadBalancerTracker.isBalancerOn()) return false;
@ -1731,6 +1730,25 @@ public class HMaster extends HRegionServer implements MasterServices {
}
}
List<RegionPlan> sucRPs = executeRegionPlansWithThrottling(plans);
if (this.cpHost != null) {
try {
this.cpHost.postBalance(sucRPs);
} catch (IOException ioe) {
// balancing already succeeded so don't change the result
LOG.error("Error invoking master coprocessor postBalance()", ioe);
}
}
}
// If LoadBalancer did not generate any plans, it means the cluster is already balanced.
// Return true indicating a success.
return true;
}
public List<RegionPlan> executeRegionPlansWithThrottling(List<RegionPlan> plans) {
List<RegionPlan> sucRPs = new ArrayList<>();
int maxRegionsInTransition = getMaxRegionsInTransition();
long balanceStartTime = System.currentTimeMillis();
long cutoffTime = balanceStartTime + this.maxBlancingTime;
int rpCount = 0; // number of RegionPlans balanced so far
@ -1766,19 +1784,7 @@ public class HMaster extends HRegionServer implements MasterServices {
}
}
}
if (this.cpHost != null) {
try {
this.cpHost.postBalance(rpCount < plans.size() ? plans.subList(0, rpCount) : plans);
} catch (IOException ioe) {
// balancing already succeeded so don't change the result
LOG.error("Error invoking master coprocessor postBalance()", ioe);
}
}
}
// If LoadBalancer did not generate any plans, it means the cluster is already balanced.
// Return true indicating a success.
return true;
return sucRPs;
}
@Override

8
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java
View File

@ -529,4 +529,12 @@ public interface MasterServices extends Server {
* @return the {@link ZKPermissionWatcher}
*/
ZKPermissionWatcher getZKPermissionWatcher();
/**
* Execute region plans with throttling
* @param plans to execute
* @return succeeded plans
*/
List<RegionPlan> executeRegionPlansWithThrottling(List<RegionPlan> plans);
}

5
hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
View File

@ -481,6 +481,11 @@ public class MockNoopMasterServices implements MasterServices {
return null;
}
@Override
public List<RegionPlan> executeRegionPlansWithThrottling(List<RegionPlan> plans) {
return null;
}
@Override
public AsyncClusterConnection getAsyncClusterConnection() {
return null;