Repository: hbase Updated Branches: refs/heads/branch-1 2b9123f93 -> b0c749874
HBASE-11709 TestMasterShutdown can fail sometime Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b0c74987 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b0c74987 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b0c74987 Branch: refs/heads/branch-1 Commit: b0c7498742f7978016682edc43462c47a627280d Parents: 2b9123f Author: Jimmy Xiang <[email protected]> Authored: Fri Aug 8 10:10:28 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Tue Aug 12 10:40:27 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/AssignmentManager.java | 7 ++----- .../org/apache/hadoop/hbase/master/HMaster.java | 16 +++++++--------- .../hadoop/hbase/master/MasterRpcServices.java | 2 +- .../hadoop/hbase/regionserver/HRegionServer.java | 2 +- 4 files changed, 11 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b0c74987/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 611a68a..a5b6d45 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -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(); http://git-wip-us.apache.org/repos/asf/hbase/blob/b0c74987/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 221e266..946476c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -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); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/b0c74987/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index d4f3d6d..88b8a17 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -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) { http://git-wip-us.apache.org/repos/asf/hbase/blob/b0c74987/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 923523f..1e31fa1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -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 {
