Skip to content

Commit a0e8723

Browse files
authored
HBASE-23041 Should not show split parent regions in HBCK report's unknown server part (#634)
Signed-off-by: Duo Zhang <[email protected]>
1 parent 20bfb43 commit a0e8723

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,10 @@ private void checkServer(RegionLocations locations) {
706706
// This should never happen but if it does, will mess up below.
707707
continue;
708708
}
709+
// Skip split parent region
710+
if (location.getRegion().isSplitParent()) {
711+
continue;
712+
}
709713
// skip the offline regions which belong to disabled table.
710714
if (isTableDisabled(location.getRegion())) {
711715
continue;

hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ private void loadRegionsFromRSReport() {
227227
HbckRegionInfo hri = entry.getValue();
228228
ServerName locationInMeta = hri.getMetaEntry().getRegionServer();
229229
if (hri.getDeployedOn().size() == 0) {
230+
if (locationInMeta == null) {
231+
continue;
232+
}
230233
// skip the offline region which belong to disabled table.
231234
if (disabledTableRegions.contains(encodedRegionName)) {
232235
continue;

0 commit comments

Comments
 (0)