Repository: hbase Updated Branches: refs/heads/master 0d7284958 -> b280a41ba
HBASE-14884 TestSplitTransactionOnCluster.testSSHCleanupDaugtherRegionsOfAbortedSplit is flakey Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b280a41b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b280a41b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b280a41b Branch: refs/heads/master Commit: b280a41ba661f205eb5de33bb8e03c33e2b005d6 Parents: 0d72849 Author: chenheng <[email protected]> Authored: Fri Nov 27 11:24:15 2015 +0800 Committer: chenheng <[email protected]> Committed: Fri Nov 27 11:24:15 2015 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/TestSplitTransactionOnCluster.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b280a41b/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 4b12cff..41fbae6 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 @@ -972,20 +972,21 @@ public class TestSplitTransactionOnCluster { List<HRegion> regions = cluster.getRegions(desc.getTableName()); int serverWith = cluster.getServerWith(regions.get(0).getRegionInfo().getRegionName()); HRegionServer regionServer = cluster.getRegionServer(serverWith); - cluster.getServerWith(regions.get(0).getRegionInfo().getRegionName()); SplitTransactionImpl st = new SplitTransactionImpl(regions.get(0), Bytes.toBytes("r3")); st.prepare(); st.stepsBeforePONR(regionServer, regionServer, false); Path tableDir = FSUtils.getTableDir(cluster.getMaster().getMasterFileSystem().getRootDir(), desc.getTableName()); - tableDir.getFileSystem(cluster.getConfiguration()); List<Path> regionDirs = FSUtils.getRegionDirs(tableDir.getFileSystem(cluster.getConfiguration()), tableDir); assertEquals(3,regionDirs.size()); - cluster.startRegionServer(); regionServer.kill(); - cluster.getRegionServerThreads().get(serverWith).join(); + // Before we check deadServerInProgress, we should ensure server is dead at master side. + while (!cluster.getMaster().getServerManager(). + getDeadServers().isDeadServer(regionServer.serverName)) { + Thread.sleep(10); + } // Wait until finish processing of shutdown while (cluster.getMaster().getServerManager().areDeadServersInProgress()) { Thread.sleep(10);
