Repository: hbase Updated Branches: refs/heads/branch-1 4ff742742 -> bc5023018
HBASE-12847 TestZKLessSplitOnCluster frequently times out in 0.98 builds(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bc502301 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bc502301 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bc502301 Branch: refs/heads/branch-1 Commit: bc5023018efcf74d3da2539cb0d558e334df3ba8 Parents: 4ff7427 Author: Rajeshbabu Chintaguntla <[email protected]> Authored: Thu Jan 15 00:14:52 2015 +0530 Committer: Rajeshbabu Chintaguntla <[email protected]> Committed: Thu Jan 15 00:14:52 2015 +0530 ---------------------------------------------------------------------- .../regionserver/TestSplitTransactionOnCluster.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bc502301/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java ---------------------------------------------------------------------- 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 c5c3e7c..7248535 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 @@ -1275,8 +1275,17 @@ public class TestSplitTransactionOnCluster { List<Path> 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(10); + } AssignmentManager am = cluster.getMaster().getAssignmentManager(); - am.processServerShutdown(regionServer.getServerName()); + while(am.getRegionStates().isRegionsInTransition()) { + Thread.sleep(10); + } assertEquals(am.getRegionStates().getRegionsInTransition().toString(), 0, am .getRegionStates().getRegionsInTransition().size()); regionDirs =
