Skip to content

HBASE-30334: Reopen parent regions on rollback of MERGE_TABLE_REGIONS_CHECK_CLOSED_REGIONS (branch-2) - #8673

Open
nirdosh0110 wants to merge 1 commit into
apache:branch-2from
nirdosh0110:HBASE-30334-branch-2
Open

nirdosh0110 wants to merge 1 commit into
apache:branch-2from
nirdosh0110:HBASE-30334-branch-2

Conversation

@nirdosh0110

Copy link
Copy Markdown
Contributor

Backport of #8583 to branch-2 (cherry-pick of 655f16c).

The only conflict was one import block, resolved by keeping branch-2's HBaseTestingUtility (master renamed it to HBaseTestingUtil) and adding the new FileSystem/Path imports. The main fix (MergeTableRegionsProcedure.java) applied without conflict.

Local verification (JDK 17, -am -Dhadoop.profile=3.0): TestMergeTableRegionsProcedure — 9 tests, 0 failures, 0 errors (includes the new regression test testRollbackReopensParentsAfterCheckClosedRegionsFailure).

Applies cleanly to branch-2.6 as well (verified) — happy to open a follow-up PR or a committer can cherry-pick.

…_CHECK_CLOSED_REGIONS (apache#8583)

Signed-off-by: Andrew Purtell <apurtell@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
(cherry picked from commit 655f16c)
@nirdosh0110

Copy link
Copy Markdown
Contributor Author

@virajjasani All checks passed on this cherry-picked PR. Please review and merge it. I'll raise the cherry-pick PR to branch-2.6.

@virajjasani

Copy link
Copy Markdown
Contributor

branch-2.6 and 2.5 both are clean cherry-picks from this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants