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:03:35 UTC
hbase git commit: HBASE-16552 MiniHBaseCluster#getServerWith() does
not ignore stopped RSs
Repository: hbase
Updated Branches:
refs/heads/0.98 f4aa4046f -> f6a996084
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/f6a99608
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f6a99608
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f6a99608
Branch: refs/heads/0.98
Commit: f6a9960841a18571edf67c9b668be8eeee502627
Parents: f4aa404
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 17:02:07 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f6a99608/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 4fdb52d..2551d10 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
@@ -677,11 +677,12 @@ public class MiniHBaseCluster extends HBaseCluster {
int count = 0;
for (JVMClusterUtil.RegionServerThread rst: getRegionServerThreads()) {
HRegionServer hrs = rst.getRegionServer();
- HRegion metaRegion =
- hrs.getOnlineRegion(regionName);
- if (metaRegion != null) {
- index = count;
- break;
+ if (!hrs.isStopped()) {
+ HRegion region = hrs.getOnlineRegion(regionName);
+ if (region != null) {
+ index = count;
+ break;
+ }
}
count++;
}