HBASE-3601 TestMasterFailover broken in TRUNK
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1076901 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
cee9f4631c
commit
c42b256df4
|
@ -57,6 +57,7 @@ Release 0.91.0 - Unreleased
|
|||
mapreduce jobs correctly (Dan Harvey via Stack)
|
||||
HBASE-3514 Speedup HFile.Writer append (Matteo via Ryan)
|
||||
HBASE-3593 DemoClient.cpp is outdated
|
||||
HBASE-3601 TestMasterFailover broken in TRUNK
|
||||
|
||||
IMPROVEMENTS
|
||||
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
|
||||
|
|
|
@ -431,6 +431,10 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
|
|||
this.assignmentManager.assignRoot();
|
||||
this.catalogTracker.waitForRoot();
|
||||
assigned++;
|
||||
} else {
|
||||
// Region already assigned. We didnt' assign it. Add to in-memory state.
|
||||
this.assignmentManager.regionOnline(HRegionInfo.ROOT_REGIONINFO,
|
||||
this.serverManager.getHServerInfo(this.catalogTracker.getRootLocation()));
|
||||
}
|
||||
LOG.info("-ROOT- assigned=" + assigned + ", rit=" + rit +
|
||||
", location=" + catalogTracker.getRootLocation());
|
||||
|
@ -445,6 +449,10 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
|
|||
// guarantee that the transition has completed
|
||||
this.assignmentManager.waitForAssignment(HRegionInfo.FIRST_META_REGIONINFO);
|
||||
assigned++;
|
||||
} else {
|
||||
// Region already assigned. We didnt' assign it. Add to in-memory state.
|
||||
this.assignmentManager.regionOnline(HRegionInfo.FIRST_META_REGIONINFO,
|
||||
this.serverManager.getHServerInfo(this.catalogTracker.getMetaLocation()));
|
||||
}
|
||||
LOG.info(".META. assigned=" + assigned + ", rit=" + rit +
|
||||
", location=" + catalogTracker.getMetaLocation());
|
||||
|
|
Loading…
Reference in New Issue