Index: src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java (revision 1428120) +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java (working copy) @@ -84,8 +84,9 @@ hbaseAdmin.move(regionInfo.getEncodedNameAsBytes(), Bytes.toBytes(targetServer.getServerName().getServerName())); do { - Thread.sleep(1); - } while (cluster.getServerWith(regionInfo.getRegionName()) == originServerNum); + Thread.sleep(10); + } while (cluster.getServerWith(regionInfo.getRegionName()) == originServerNum || + cluster.getMaster().getAssignmentManager().getRegionServerOfRegion(regionInfo) == null); // Put data: r2->v2 putDataAndVerify(table, "r2", FAMILY, "v2", 2); Index: src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (revision 1428120) +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (working copy) @@ -962,6 +962,11 @@ LOG. info("Moving " + hri.getRegionNameAsString() + " to " + hrs.getServerName() + "; metaServerIndex=" + metaServerIndex); + for (int i = 0; cluster.getMaster().getAssignmentManager() + .getRegionServerOfRegion(hri) == null + && i < 100; i++) { + Thread.sleep(10); + } admin.move(hri.getEncodedNameAsBytes(), Bytes.toBytes(hrs.getServerName().toString())); }