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

HBASE-8560 TestMasterShutdown failing in trunk 0.95/trunk -- "Unable to get data of znode /hbase/meta-region-server because node does not exist (not an error)" 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1483547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-05-16 20:28:19 +00:00
parent 1a131b9e3c
commit 4473041015
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -801,6 +801,9 @@ MasterServices, Server {
// Make sure meta assigned before proceeding. // Make sure meta assigned before proceeding.
status.setStatus("Assigning Meta Region"); status.setStatus("Assigning Meta Region");
assignMeta(status); assignMeta(status);
// check if master is shutting down because above assignMeta could return even META isn't
// assigned when master is shutting down
if(this.stopped) return;
if (this.distributedLogReplay && oldMetaServerLocation != null if (this.distributedLogReplay && oldMetaServerLocation != null
&& previouslyFailedServers.contains(oldMetaServerLocation)) { && previouslyFailedServers.contains(oldMetaServerLocation)) {
@ -941,6 +944,7 @@ MasterServices, Server {
this.assignmentManager.regionOnline(HRegionInfo.FIRST_META_REGIONINFO, this.assignmentManager.regionOnline(HRegionInfo.FIRST_META_REGIONINFO,
this.catalogTracker.getMetaLocation()); this.catalogTracker.getMetaLocation());
} }
enableCatalogTables(Bytes.toString(HConstants.META_TABLE_NAME)); enableCatalogTables(Bytes.toString(HConstants.META_TABLE_NAME));
LOG.info(".META. assigned=" + assigned + ", rit=" + rit + ", location=" LOG.info(".META. assigned=" + assigned + ", rit=" + rit + ", location="
+ catalogTracker.getMetaLocation()); + catalogTracker.getMetaLocation());
@ -2059,7 +2063,7 @@ MasterServices, Server {
serverShutdownHandlerEnabled = false; serverShutdownHandlerEnabled = false;
initialized = false; initialized = false;
finishInitialization(status, true); finishInitialization(status, true);
return Boolean.TRUE; return !stopped;
} finally { } finally {
status.cleanup(); status.cleanup();
} }