HBASE-23041 Should not show split parent regions in HBCK report's unk…

…nown server part (#634) Signed-off-by: Duo Zhang <zhangduo@apache.org>
apache · Sep 19, 2019 · 91a6134 · 91a6134
1 parent fb82c8e
commit 91a6134
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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
@@ -706,6 +706,10 @@ private void checkServer(RegionLocations locations) {
           // 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
@@ -227,6 +227,9 @@ private void loadRegionsFromRSReport() {
       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;