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

[zghao]

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

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


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

commit 44f01adddf09e06125262e92928736370f3e5fef
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 <zhang...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java  | 4 ++++
 .../src/main/java/org/apache/hadoop/hbase/master/HbckChore.java       | 3 +++
 2 files changed, 7 insertions(+)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index 42c830a..a9becdf 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -706,6 +706,10 @@ public class CatalogJanitor extends ScheduledChore {
           // This should never happen but if it does, will mess up below.
           continue;
         }
+        // Skip split parent region
+        if (location.getRegion().isSplitParent()) {
+          continue;
+        }
         // skip the offline regions which belong to disabled table.
         if (isTableDisabled(location.getRegion())) {
           continue;
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;