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

HBASE-8991 TestMasterFailover.testMasterFailoverWithMockedRITOnDeadRS failed again 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504683 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2013-07-18 22:07:11 +00:00
parent 4e9a79a0ba
commit 6a1b724e6d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -2196,7 +2196,6 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
return this.rsHost; return this.rsHost;
} }
@Override @Override
public ConcurrentMap<byte[], Boolean> getRegionsInTransitionInRS() { public ConcurrentMap<byte[], Boolean> getRegionsInTransitionInRS() {
return this.regionsInTransitionInRS; return this.regionsInTransitionInRS;

18
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
View File

@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -41,7 +40,6 @@ import org.apache.hadoop.hbase.ClusterStatus;
import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.LargeTests;
@ -789,7 +787,7 @@ public class TestMasterFailover {
ZKAssign.blockUntilNoRIT(zkw); ZKAssign.blockUntilNoRIT(zkw);
log("No more RIT in ZK"); log("No more RIT in ZK");
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
final long maxTime = 120000; long maxTime = 120000;
boolean done = master.assignmentManager.waitUntilNoRegionsInTransition(maxTime); boolean done = master.assignmentManager.waitUntilNoRegionsInTransition(maxTime);
if (!done) { if (!done) {
LOG.info("rit=" + master.getAssignmentManager().getRegionStates().getRegionsInTransition()); LOG.info("rit=" + master.getAssignmentManager().getRegionStates().getRegionsInTransition());
@ -801,10 +799,22 @@ public class TestMasterFailover {
// Grab all the regions that are online across RSs // Grab all the regions that are online across RSs
Set<HRegionInfo> onlineRegions = new TreeSet<HRegionInfo>(); Set<HRegionInfo> onlineRegions = new TreeSet<HRegionInfo>();
now = System.currentTimeMillis();
maxTime = 30000;
for (JVMClusterUtil.RegionServerThread rst : for (JVMClusterUtil.RegionServerThread rst :
cluster.getRegionServerThreads()) { cluster.getRegionServerThreads()) {
try { try {
onlineRegions.addAll(ProtobufUtil.getOnlineRegions(rst.getRegionServer())); HRegionServer rs = rst.getRegionServer();
while (!rs.getRegionsInTransitionInRS().isEmpty()) {
elapsed = System.currentTimeMillis() - now;
assertTrue("Test timed out in getting online regions", elapsed < maxTime);
if (rs.isAborted() || rs.isStopped()) {
// This region server is stopped, skip it.
break;
}
Thread.sleep(100);
}
onlineRegions.addAll(ProtobufUtil.getOnlineRegions(rs));
} catch (RegionServerStoppedException e) { } catch (RegionServerStoppedException e) {
LOG.info("Got RegionServerStoppedException", e); LOG.info("Got RegionServerStoppedException", e);
} }