HBASE-16552 MiniHBaseCluster#getServerWith() does not ignore stopped RSs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fa7731de Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa7731de Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa7731de Branch: refs/heads/branch-1 Commit: fa7731de6e1a343f079fa81ba7411c14609cb3c9 Parents: 84ad592 Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Fri Sep 2 16:49:17 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Fri Sep 2 16:52:57 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fa7731de/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java index f788bed..706d8e7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -696,10 +696,12 @@ public class MiniHBaseCluster extends HBaseCluster { int count = 0; for (JVMClusterUtil.RegionServerThread rst: getRegionServerThreads()) { HRegionServer hrs = rst.getRegionServer(); - Region region = hrs.getOnlineRegion(regionName); - if (region != null) { - index = count; - break; + if (!hrs.isStopped()) { + Region region = hrs.getOnlineRegion(regionName); + if (region != null) { + index = count; + break; + } } count++; }
