Author: tedyu
Date: Fri Sep 30 03:08:38 2011
New Revision: 1177488
URL: http://svn.apache.org/viewvc?rev=1177488&view=rev
Log:
HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao)
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1177488&r1=1177487&r2=1177488&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 30 03:08:38 2011
@@ -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
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1177488&r1=1177487&r2=1177488&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Fri
Sep 30 03:08:38 2011
@@ -559,6 +559,8 @@ implements HMasterInterface, HMasterRegi
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.
