diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java index f8e87dd..5a7c6ef 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java @@ -468,6 +468,8 @@ public class TestAssignmentManagerOnCluster { master.assignRegion(hri); AssignmentManager am = master.getAssignmentManager(); assertTrue(am.waitForAssignment(hri)); + ServerName sn = am.getRegionStates().getRegionServerOfRegion(hri); + TEST_UTIL.assertRegionOnServer(hri, sn, 6000); MyRegionObserver.preCloseEnabled.set(true); am.unassign(hri); @@ -639,10 +641,8 @@ public class TestAssignmentManagerOnCluster { master.assignRegion(hri); AssignmentManager am = master.getAssignmentManager(); assertTrue(am.waitForAssignment(hri)); - while (!HBaseTestingUtility.getAllOnlineRegions( - TEST_UTIL.getHBaseCluster()).contains(hri.getRegionNameAsString())) { - Threads.sleep(100); // This won't take long - } + ServerName sn = am.getRegionStates().getRegionServerOfRegion(hri); + TEST_UTIL.assertRegionOnServer(hri, sn, 6000); MyRegionObserver.postCloseEnabled.set(true); am.unassign(hri);