HBASE-28226 Add logic to check for RegionStateNode null pointer in FlushRegionProcedure #5548
Conversation
This file contains 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
added 2 commits
November 29, 2023 13:02
|
💔 -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. |
|
🎊 +1 overall
This message was automatically generated. |
Apache9
reviewed
Nov 29, 2023
There was a problem hiding this comment.
Checked the code in FlushTableProcedure, we only acquire shared lock on a table so it is possible that merge/split procedures are executed at the same time, thus it is possible that we get a null RegionStateNode while actually executing the FlushRegionProcedure.
And adding a null check is enough, because we need to close the region before merging/splitting, so we can make sure that the region is flushed.
Overall LGTM. Just some minor updates about logging, comments and style.
| import org.apache.hadoop.hbase.procedure2.ProcedureSuspendedException; | ||
| import org.apache.hadoop.hbase.procedure2.ProcedureUtil; | ||
| import org.apache.hadoop.hbase.procedure2.ProcedureYieldException; | ||
| import org.apache.hadoop.hbase.procedure2.*; |
There was a problem hiding this comment.
Please avoid star imports?
| @@ -88,6 +81,12 @@ protected Procedure<MasterProcedureEnv>[] execute(MasterProcedureEnv env) | |||
|
|
|||
| RegionStates regionStates = env.getAssignmentManager().getRegionStates(); | |||
| RegionStateNode regionNode = regionStates.getRegionStateNode(region); | |||
| if (regionNode == null) { | |||
| LOG.warn( | |||
There was a problem hiding this comment.
Since this is possible in normal flow, I think a debug log is enough? And better add a comment to reference HBASE-28226 too.
There was a problem hiding this comment.
Thank you for your suggestions, I have made the appropriate adjustments.
|
💔 -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. |
Apache9
reviewed
Dec 2, 2023
| @@ -88,6 +88,12 @@ protected Procedure<MasterProcedureEnv>[] execute(MasterProcedureEnv env) | |||
|
|
|||
| RegionStates regionStates = env.getAssignmentManager().getRegionStates(); | |||
| RegionStateNode regionNode = regionStates.getRegionStateNode(region); | |||
| if (regionNode == null) { | |||
| LOG.debug( | |||
| "Region {} is not in region states, it is very likely that it has been cleared by other procedures such as merge or split, so skip {}. See HBASE-28226", | |||
There was a problem hiding this comment.
This line is too long, please split it so we can avoid the checkstyle warning? The maximum length for HBase is 100.
There was a problem hiding this comment.
Thank you for the reminder, I have split it into two lines.
|
🎊 +1 overall
This message was automatically generated. |
Apache9
approved these changes
Dec 3, 2023
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
kadirozde
pushed a commit
to kadirozde/hbase
that referenced
this pull request
Jan 5, 2024
…ushRegionProcedure (apache#5548) Co-authored-by: lvhaiping.lhp <lvhaiping.lhp@alibaba-inc.com> Signed-off-by: Duo Zhang <zhangduo@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.