HBASE-29724: Backport missing changes of "HBASE-25334: TestRSGroupsFallback.testFallback is flaky" into branch-2 and branch-2.6 (#7472) #7476
+13
−12
Conversation
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
There was a problem hiding this comment.
Pull request overview
This PR backports a fix for a flaky test (HBASE-25334) from the main branch to branch-2 and branch-2.6. The fix addresses race conditions in TestRSGroupsFallback.testFallback by ensuring that finished ServerCrashProcedure instances are not counted as "in progress."
- Core fix: Modified
ServerManager.areDeadServersInProgress()to filter out finished procedures - Enhanced
TestDeadServer.testCrashProcedureReplay()to verify procedure replay behavior after executor restart - Simplified
TestRSGroupsFallback.testFallback()by removing unnecessary variable assignments and wait logic
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java | Fixed areDeadServersInProgress() to only count non-finished ServerCrashProcedure instances |
| hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java | Enhanced test to verify proper behavior after procedure executor restart and removed unused import |
| hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsFallback.java | Simplified test by removing unnecessary variable capture and wait logic, improved parameter naming |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
stoty
requested changes
Nov 22, 2025
Contributor
There was a problem hiding this comment.
HBASE-25334 is already in present in 2.5 and 2.6.
You should probably change the ticket name and description to reflect the real situation.
Did something broke the original patch in the meantime ? Was the original commit incorrect/incomplete ? Or is this needed for some other reason ?
Contributor
Author
in my review in #7472 (review), I mentioned about that HBASE-25334 (32c4432) was a partial patch that does not have the changes in ServerManager.java and thus we had first backport https://issues.apache.org/jira/browse/HBASE-29720 , and then add those missing changes in the PR of #7472 against branch-2 (merged), and now this one. branch-2 has been merged and the title cannot be changed (IMO developer would also look into the changes of commit), it's fine to change the title of this PR to match what is requesting, I will also add some information in the commit body about it. |
taklwu
changed the title
taklwu
changed the title
…allback.testFallback is flaky" into branch-2 and branch-2.6 (apache#7472) apache#7476 The change in HBASE-25334 (introduced by commit 32c4432) has diverged between the master and branch-2 branches. This is a following up changes after HBASE-29720 and have the complete functional changes of HBASE-25334 that uses SCP as the source of dead servers in progress. Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
taklwu
force-pushed
the
HBASE-29724-branch2.6
branch
from
078da31 to
a5cff58
Compare
taklwu
changed the title
taklwu
changed the title
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
The change in HBASE-25334 (introduced by commit 32c4432 in branch-2 and branch-2.6) has diverged between the master (#2728) and branch-2 branches. This is a following up changes after HBASE-29720 and have the complete functional changes of HBASE-25334 that uses SCP as the source of dead servers in progress.
this is a clean cherry-pick from #7472 / 6fb6269