HBASE-30334: Reopen parent regions on rollback of MERGE_TABLE_REGIONS_CHECK_CLOSED_REGIONS (branch-2) - #8673
Merged
Conversation
…_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)
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
approved these changes
Sep 17, 2026
Contributor
|
branch-2.6 and 2.5 both are clean cherry-picks from this PR? |
Contributor
Author
Yes @virajjasani for both 2.6 & 2.5 branches cherry pick is clean from this PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 toHBaseTestingUtil) and adding the newFileSystem/Pathimports. 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 testtestRollbackReopensParentsAfterCheckClosedRegionsFailure).Applies cleanly to branch-2.6 as well (verified) — happy to open a follow-up PR or a committer can cherry-pick.