Author: tedyu
Date: Fri Sep 30 03:10:22 2011
New Revision: 1177489
URL: http://svn.apache.org/viewvc?rev=1177489&view=rev
Log:
HBASE-4212 TestMasterFailover fails occasionally (Gao Jinchao)
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1177489&r1=1177488&r2=1177489&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Sep 30 03:10:22 2011
@@ -308,6 +308,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-4492 TestRollingRestart fails intermittently
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1177489&r1=1177488&r2=1177489&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Fri Sep 30 03:10:22 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.
