Author: jxiang
Date: Mon Jul 29 22:15:32 2013
New Revision: 1508212
URL: http://svn.apache.org/r1508212
Log:
HBASE-9074 TestAdmin.testMoveToPreviouslyAssignedRS fails
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1508212&r1=1508211&r2=1508212&view=diff
==============================================================================
---
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
(original)
+++
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Mon Jul 29 22:15:32 2013
@@ -1555,7 +1555,7 @@ public class TestAdmin {
}
@Test
- public void testMoveToPreviouslyAssignedRS() throws IOException {
+ public void testMoveToPreviouslyAssignedRS() throws IOException,
InterruptedException {
byte[] tableName = Bytes.toBytes("testMoveToPreviouslyAssignedRS");
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster master = cluster.getMaster();
@@ -1563,6 +1563,8 @@ public class TestAdmin {
List<HRegionInfo> tableRegions = localAdmin.getTableRegions(tableName);
HRegionInfo hri = tableRegions.get(0);
AssignmentManager am = master.getAssignmentManager();
+ assertTrue("Region " + hri.getRegionNameAsString()
+ + " should be assigned properly", am.waitForAssignment(hri));
ServerName server = am.getRegionStates().getRegionServerOfRegion(hri);
localAdmin.move(hri.getEncodedNameAsBytes(),
Bytes.toBytes(server.getServerName()));
assertEquals("Current region server and region server before move should
be same.", server,
