Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-23041 Should not show split parent regions in HBCK report's unknown server part (#634) 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
Guanghao Zhang 2019-09-19 10:59:01 +08:00 committed by GitHub
parent 20bfb43db6
commit a0e8723b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -706,6 +706,10 @@ public class CatalogJanitor extends ScheduledChore {
// This should never happen but if it does, will mess up below. // This should never happen but if it does, will mess up below.
continue; continue;
} }
// Skip split parent region
if (location.getRegion().isSplitParent()) {
continue;
}
// skip the offline regions which belong to disabled table. // skip the offline regions which belong to disabled table.
if (isTableDisabled(location.getRegion())) { if (isTableDisabled(location.getRegion())) {
continue; continue;

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

@ -227,6 +227,9 @@ public class HbckChore extends ScheduledChore {
HbckRegionInfo hri = entry.getValue(); HbckRegionInfo hri = entry.getValue();
ServerName locationInMeta = hri.getMetaEntry().getRegionServer(); ServerName locationInMeta = hri.getMetaEntry().getRegionServer();
if (hri.getDeployedOn().size() == 0) { if (hri.getDeployedOn().size() == 0) {
if (locationInMeta == null) {
continue;
}
// skip the offline region which belong to disabled table. // skip the offline region which belong to disabled table.
if (disabledTableRegions.contains(encodedRegionName)) { if (disabledTableRegions.contains(encodedRegionName)) {
continue; continue;