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

HBASE-11709 TestMasterShutdown can fail sometime

This commit is contained in:
Jimmy Xiang 2014-08-08 10:10:28 -07:00
parent 2b9123f938
commit b0c7498742
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1521,11 +1521,6 @@ public class AssignmentManager extends ZooKeeperListener {
if (isDisabledorDisablingRegionInRIT(region)) {
return;
}
if (this.serverManager.isClusterShutdown()) {
LOG.info("Cluster shutdown is set; skipping assign of " +
region.getRegionNameAsString());
return;
}
String encodedName = region.getEncodedName();
Lock lock = locker.acquireLock(encodedName);
try {
@ -3284,6 +3279,8 @@ public class AssignmentManager extends ZooKeeperListener {
synchronized (zkEventWorkerWaitingList){
zkEventWorkerWaitingList.clear();
}
// Shutdown the threadpool executor service
threadPoolExecutorService.shutdownNow();
zkEventWorkers.shutdownNow();
regionStateStore.stop();

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

@ -1647,18 +1647,16 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
LOG.error("Error call master coprocessor preShutdown()", ioe);
}
}
if (this.assignmentManager != null) {
this.assignmentManager.shutdown();
if (this.serverManager != null) {
this.serverManager.shutdownCluster();
}
try {
if (this.clusterStatusTracker != null){
if (this.clusterStatusTracker != null){
try {
this.clusterStatusTracker.setClusterDown();
if (this.serverManager != null) {
this.serverManager.shutdownCluster();
}
} catch (KeeperException e) {
LOG.error("ZooKeeper exception trying to set cluster as down in ZK", e);
}
} catch (KeeperException e) {
LOG.error("ZooKeeper exception trying to set cluster as down in ZK", e);
}
}

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View File

@ -874,7 +874,7 @@ public class MasterRpcServices extends RSRpcServices
public IsMasterRunningResponse isMasterRunning(RpcController c,
IsMasterRunningRequest req) throws ServiceException {
try {
master.checkInitialized();
master.checkServiceStarted();
return IsMasterRunningResponse.newBuilder().setIsMasterRunning(
!master.isStopped()).build();
} catch (IOException e) {

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -671,7 +671,7 @@ public class HRegionServer extends HasThread implements
* @return False if cluster shutdown in progress
*/
private boolean isClusterUp() {
return this.clusterStatusTracker.isClusterUp();
return clusterStatusTracker != null && clusterStatusTracker.isClusterUp();
}
private void initializeThreads() throws IOException {