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

HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1177488 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-09-30 03:08:38 +00:00
parent b2f6235668
commit 3a7bda2cd1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -318,6 +318,7 @@ Release 0.92.0 - Unreleased
HBASE-4513 NOTICES.txt refers to Facebook for Thrift
HBASE-3130 [replication] ReplicationSource can't recover from session
expired on remote clusters (Chris Trezzo via JD)
HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao)
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected

2
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -559,6 +559,8 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
if (!catalogTracker.verifyRootRegionLocation(timeout)) {
this.assignmentManager.assignRoot();
this.catalogTracker.waitForRoot();
//This guarantees that the transition has completed
this.assignmentManager.waitForAssignment(HRegionInfo.ROOT_REGIONINFO);
assigned++;
} else {
// Region already assigned. We didnt' assign it. Add to in-memory state.