HBASE-26383 HBCK incorrectly reports inconsistencies for recently split regions following a master failover (#3775)

apurtell · apurtell · commit dce45ec16a1d · 2021-10-20T15:55:07.000-07:00
A regression was introduced by HBASE-25847 which changed regionInfo#isParentSplit to regionState#isSplit. The region state after restart is CLOSED instead of SPLIT. We need to check both regionState and regionInfo for split status. Signed-off-by: Viraj Jasani <vjasani@apache.org>
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
@@ -223,7 +223,8 @@ private void loadRegionsFromInMemoryState() {
           .isTableState(regionInfo.getTable(), TableState.State.DISABLED)) {
         disabledTableRegions.add(regionInfo.getRegionNameAsString());
       }
-      if (regionState.isSplit()) {
+      // Check both state and regioninfo for split status, see HBASE-26383
+      if (regionState.isSplit() || regionInfo.isSplit()) {
         splitParentRegions.add(regionInfo.getRegionNameAsString());
       }
       HbckRegionInfo.MetaEntry metaEntry =

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,8 @@ private void loadRegionsFromInMemoryState() {`
`223`	`223`	`.isTableState(regionInfo.getTable(), TableState.State.DISABLED)) {`
`224`	`224`	`disabledTableRegions.add(regionInfo.getRegionNameAsString());`
`225`	`225`	`}`
`226`		`- if (regionState.isSplit()) {`
	`226`	`+ // Check both state and regioninfo for split status, see HBASE-26383`
	`227`	`+ if (regionState.isSplit() \|\| regionInfo.isSplit()) {`
`227`	`228`	`splitParentRegions.add(regionInfo.getRegionNameAsString());`
`228`	`229`	`}`
`229`	`230`	`HbckRegionInfo.MetaEntry metaEntry =`