[hbase] branch branch-2.1 updated: HBASE-23041 Should not show split parent regions in HBCK report's unknown server part (#634)

[zg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new abd7ece  HBASE-23041 Should not show split parent regions in HBCK report's unknown server part (#634)
abd7ece is described below

commit abd7ececeae53fb08fd52597410d1e0d2cefbb7f
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Thu Sep 19 10:59:01 2019 +0800

    HBASE-23041 Should not show split parent regions in HBCK report's unknown server part (#634)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hbase/master/HbckChore.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
index d144937..fc0111d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java
@@ -227,6 +227,9 @@ public class HbckChore extends ScheduledChore {
       HbckRegionInfo hri = entry.getValue();
       ServerName locationInMeta = hri.getMetaEntry().getRegionServer();
       if (hri.getDeployedOn().size() == 0) {
+        if (locationInMeta == null) {
+          continue;
+        }
         // skip the offline region which belong to disabled table.
         if (disabledTableRegions.contains(encodedRegionName)) {
           continue;