You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2016/09/03 00:01:53 UTC

[4/5] hbase git commit: HBASE-16552 MiniHBaseCluster#getServerWith() does not ignore stopped RSs

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/e181533e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e181533e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e181533e

Branch: refs/heads/branch-1.2
Commit: e181533ecdb756db2eaaf44cf49eb8cc1e1efaa9
Parents: 80444b0
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Fri Sep 2 16:49:17 2016 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Fri Sep 2 16:53:23 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/e181533e/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 64470f3..8ab37cb 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
@@ -697,10 +697,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++;
     }