From 2f4f36581de53276a5a4dc8b4f7896845712c8af Mon Sep 17 00:00:00 2001 From: manukranthk Date: Mon, 5 Jan 2015 17:56:33 -0800 Subject: [PATCH] HBASE-12771 Fix TestFastFail on branch 1 --- .../java/org/apache/hadoop/hbase/client/TestFastFail.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java index 709e94b..73565cb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java @@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.exceptions.PreemptiveFastFailException; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; @@ -210,8 +212,14 @@ public class TestFastFail { ClusterStatus status = TEST_UTIL.getHBaseCluster().getClusterStatus(); // Kill a regionserver - TEST_UTIL.getHBaseCluster().getRegionServer(0).getRpcServer().stop(); - TEST_UTIL.getHBaseCluster().getRegionServer(0).stop("Testing"); + for (int i = 0; i < SLAVES; i++) { + HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(i); + List regions = server.getOnlineRegions(TableName.META_TABLE_NAME); + if (regions.size() > 0) continue; // We don't want to kill META table because that adds extra + // latencies which can't be tested very easily. + server.getRpcServer().stop(); + server.stop("Testing"); + } // Let the threads continue going continueOtherHalf.countDown(); -- 1.9.5