Repository: hbase Updated Branches: refs/heads/master 1a21c1684 -> 7e872a81a
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/7e872a81 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7e872a81 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7e872a81 Branch: refs/heads/master Commit: 7e872a81a9f404123ae583517b2db10e0bb7649c Parents: 1a21c16 Author: Rajeshbabu Chintaguntla <[email protected]> Authored: Thu Jan 15 00:00:37 2015 +0530 Committer: Rajeshbabu Chintaguntla <[email protected]> Committed: Thu Jan 15 00:00:37 2015 +0530 ---------------------------------------------------------------------- .../hbase/regionserver/TestSplitTransactionOnCluster.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7e872a81/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 321ad12..ee83d46 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 @@ -978,8 +978,15 @@ 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()); assertEquals(am.getRegionStates().getRegionsInTransition().toString(), 0, am .getRegionStates().getRegionsInTransition().size()); regionDirs =
