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

HBASE-20548 Master fails to startup on large clusters, refreshing block distribution

Browse Source 
Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
Thiruvel Thirumoolan 2018-05-22 18:28:31 -07:00 committed by Andrew Purtell
parent 416f28356c
commit b892be7440
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java
View File

@ -455,4 +455,9 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc
public boolean isStopped() {
return false;
}
@Override
public void postMasterStartupInitialize() {
this.internalBalancer.postMasterStartupInitialize();
}
}

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

@ -933,6 +933,17 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
}
zombieDetector.interrupt();
/*
* After master has started up, lets do balancer post startup initialization. Since this runs
* in activeMasterManager thread, it should be fine.
*/
long start = System.currentTimeMillis();
this.balancer.postMasterStartupInitialize();
if (LOG.isDebugEnabled()) {
LOG.debug("Balancer post startup initialization complete, took " + (
(System.currentTimeMillis() - start) / 1000) + " seconds");
}
}
private void initQuotaManager() throws IOException {

5
hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java
View File

@ -152,4 +152,9 @@ public interface LoadBalancer extends Configurable, Stoppable, ConfigurationObse
*/
@Override
void onConfigurationChange(Configuration conf);
/**
* If balancer needs to do initialization after Master has started up, lets do that here.
*/
void postMasterStartupInitialize();
}

26
hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
View File

@ -1267,6 +1267,19 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
}
}
@Override
public void postMasterStartupInitialize() {
if (services != null && regionFinder != null) {
try {
Set<HRegionInfo> regions =
services.getAssignmentManager().getRegionStates().getRegionAssignments().keySet();
regionFinder.refreshAndWait(regions);
} catch (Exception e) {
LOG.warn("Refreshing region HDFS Block dist failed with exception, ignoring", e);
}
}
}
public void setRackManager(RackManager rackManager) {
this.rackManager = rackManager;
}
@ -1367,7 +1380,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
return assignments;
}
Cluster cluster = createCluster(servers, regions, false);
Cluster cluster = createCluster(servers, regions);
List<HRegionInfo> unassignedRegions = new ArrayList<HRegionInfo>();
roundRobinAssignment(cluster, regions, unassignedRegions,
@ -1413,11 +1426,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
return assignments;
}
protected Cluster createCluster(List<ServerName> servers,
Collection<HRegionInfo> regions, boolean forceRefresh) {
if (forceRefresh && useRegionFinder) {
regionFinder.refreshAndWait(regions);
}
protected Cluster createCluster(List<ServerName> servers, Collection<HRegionInfo> regions) {
// Get the snapshot of the current assignments for the regions in question, and then create
// a cluster out of it. Note that we might have replicas already assigned to some servers
// earlier. So we want to get the snapshot to see those assignments, but this will only contain
@ -1491,7 +1500,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
}
List<HRegionInfo> regions = Lists.newArrayList(regionInfo);
Cluster cluster = createCluster(servers, regions, false);
Cluster cluster = createCluster(servers, regions);
return randomAssignment(cluster, regionInfo, servers);
}
@ -1569,8 +1578,6 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
int numRandomAssignments = 0;
int numRetainedAssigments = 0;
Cluster cluster = createCluster(servers, regions.keySet(), true);
for (Map.Entry<HRegionInfo, ServerName> entry : regions.entrySet()) {
HRegionInfo region = entry.getKey();
ServerName oldServerName = entry.getValue();
@ -1613,6 +1620,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
// If servers from prior assignment aren't present, then lets do randomAssignment on regions.
if (randomAssignRegions.size() > 0) {
Cluster cluster = createCluster(servers, regions.keySet());
for (Map.Entry<ServerName, List<HRegionInfo>> entry : assignments.entrySet()) {
ServerName sn = entry.getKey();
for (HRegionInfo region : entry.getValue()) {