Repository: hbase Updated Branches: refs/heads/master 5719e4098 -> 478bdc8ea
HBASE-11866 TestDistributedLogSplitting is flaky Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/478bdc8e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/478bdc8e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/478bdc8e Branch: refs/heads/master Commit: 478bdc8ea50941ef281152f4329cd93843102e50 Parents: 5719e40 Author: Jimmy Xiang <[email protected]> Authored: Sat Aug 30 21:48:26 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Sun Aug 31 08:57:45 2014 -0700 ---------------------------------------------------------------------- .../hbase/master/TestDistributedLogSplitting.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/478bdc8e/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index 5fc079f..4506ce9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -78,7 +78,6 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; -import org.apache.hadoop.hbase.coordination.SplitLogManagerCoordination; import org.apache.hadoop.hbase.coordination.ZKSplitLogManagerCoordination; import org.apache.hadoop.hbase.exceptions.OperationConflictException; import org.apache.hadoop.hbase.exceptions.RegionInRecoveryException; @@ -170,7 +169,7 @@ public class TestDistributedLogSplitting { cluster.waitForActiveAndReadyMaster(); master = cluster.getMaster(); while (cluster.getLiveRegionServerThreads().size() < num_rs) { - Threads.sleep(1); + Threads.sleep(10); } } @@ -1597,14 +1596,19 @@ public class TestDistributedLogSplitting { */ private HRegionServer findRSToKill(boolean hasMetaRegion, String tableName) throws Exception { List<RegionServerThread> rsts = cluster.getLiveRegionServerThreads(); - int numOfRSs = rsts.size(); List<HRegionInfo> regions = null; HRegionServer hrs = null; - for (int i = 0; i < numOfRSs; i++) { + for (RegionServerThread rst: rsts) { + hrs = rst.getRegionServer(); + while (rst.isAlive() && !hrs.isOnline()) { + Thread.sleep(100); + } + if (!rst.isAlive()) { + continue; + } boolean isCarryingMeta = false; boolean foundTableRegion = false; - hrs = rsts.get(i).getRegionServer(); regions = ProtobufUtil.getOnlineRegions(hrs.getRSRpcServices()); for (HRegionInfo region : regions) { if (region.isMetaRegion()) {
