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

Revert "HBASE-19906 TestZooKeeper Timeout" 

Revert. Pushed prematurely.

This reverts commit 80af9bdef0.
This commit is contained in:
Michael Stack 2018-01-31 15:56:26 -08:00
parent e6d2682f0f
commit 7a82126f8b
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -865,11 +865,6 @@ public class HMaster extends HRegionServer implements MasterServices {
// Make sure meta assigned before proceeding. // Make sure meta assigned before proceeding.
status.setStatus("Recovering Meta Region"); status.setStatus("Recovering Meta Region");
// Check if master is shutting down because issue initializing regionservers or balancer.
if (isStopped()) {
return;
}
// we recover hbase:meta region servers inside master initialization and // we recover hbase:meta region servers inside master initialization and
// handle other failed servers in SSH in order to start up master node ASAP // handle other failed servers in SSH in order to start up master node ASAP
MasterMetaBootstrap metaBootstrap = createMetaBootstrap(this, status); MasterMetaBootstrap metaBootstrap = createMetaBootstrap(this, status);

13
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
View File

@ -1895,20 +1895,9 @@ public class AssignmentManager implements ServerListener {
.getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO, .getRegionInfoForReplica(RegionInfoBuilder.FIRST_META_REGIONINFO,
RegionInfo.DEFAULT_REPLICA_ID); RegionInfo.DEFAULT_REPLICA_ID);
RegionState regionStateNode = getRegionStates().getRegionState(hri); RegionState regionStateNode = getRegionStates().getRegionState(hri);
if (regionStateNode == null) { if (!regionStateNode.getServerName().equals(serverName)) {
LOG.warn("RegionStateNode is null for " + hri);
return; return;
} }
ServerName rsnServerName = regionStateNode.getServerName();
if (rsnServerName == null) {
return;
}
if (rsnServerName != null && !rsnServerName.equals(serverName)) {
return;
} else {
LOG.warn("Empty ServerName in RegionStateNode; proceeding regardless in case latched " +
"RecoverMetaProcedure procedure for clean up.");
}
// meta has been assigned to crashed server. // meta has been assigned to crashed server.
LOG.info("Meta assigned to crashed " + serverName + "; reassigning..."); LOG.info("Meta assigned to crashed " + serverName + "; reassigning...");
// Handle failure and wake event // Handle failure and wake event