diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 9e74314..52ea996 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -1161,8 +1161,17 @@ public class TestSplitTransactionOnCluster { List regionDirs = FSUtils.getRegionDirs(tableDir.getFileSystem(cluster.getConfiguration()), tableDir); assertEquals(3,regionDirs.size()); + cluster.startRegionServer(); + regionServer.kill(); + cluster.getRegionServerThreads().get(serverWith).join(); + // Wait until finish processing of shutdown + while (cluster.getMaster().getServerManager().areDeadServersInProgress()) { + Thread.sleep(5); + } AssignmentManager am = cluster.getMaster().getAssignmentManager(); - am.processServerShutdown(regionServer.getServerName()); + while(am.getRegionStates().isRegionsInTransition()){ + Thread.sleep(5); + } assertEquals(am.getRegionStates().getRegionsInTransition().toString(), am.getRegionStates() .getRegionsInTransition().size(), 0); regionDirs =