You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/01/03 06:38:02 UTC
svn commit: r1428171 - in
/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver:
TestHRegionOnCluster.java TestSplitTransactionOnCluster.java
Author: larsh
Date: Thu Jan 3 05:38:02 2013
New Revision: 1428171
URL: http://svn.apache.org/viewvc?rev=1428171&view=rev
Log:
HBASE-7483 TestHRegionOnCluster and TestSplitTransactionOnCluster are racy with HBaseAdmin.move()
Modified:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java?rev=1428171&r1=1428170&r2=1428171&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java Thu Jan 3 05:38:02 2013
@@ -84,8 +84,9 @@ public class TestHRegionOnCluster {
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);
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1428171&r1=1428170&r2=1428171&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Thu Jan 3 05:38:02 2013
@@ -962,6 +962,11 @@ public class TestSplitTransactionOnClust
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()));
}