Author: tedyu
Date: Fri Sep 30 03:02:11 2011
New Revision: 1177484
URL: http://svn.apache.org/viewvc?rev=1177484&view=rev
Log:
HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao)
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1177484&r1=1177483&r2=1177484&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Sep 30 03:02:11 2011
@@ -65,6 +65,7 @@ Release 0.90.5 - Unreleased
HBASE-4295 rowcounter does not return the correct number of rows in
certain circumstances (David Revell)
HBASE-4512 JVMClusterUtil throwing wrong exception when master thread
cannot be created (Ram)
+ HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao)
IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles)
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1177484&r1=1177483&r2=1177484&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Fri Sep 30 03:02:11 2011
@@ -430,6 +430,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++;
}
LOG.info("-ROOT- assigned=" + assigned + ", rit=" + rit +
