HDDS-15377. Switch SCM to use new ScmVersionManager#10368
Draft
errose28 wants to merge 3 commits into
Draft
Conversation
…inology Co-authored-by: Cursor <cursoragent@cursor.com>
…ctor OMVersionManager Co-authored-by: Cursor <cursoragent@cursor.com>
…ization Co-authored-by: Cursor <cursoragent@cursor.com>
This was referenced May 27, 2026
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
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.
DRAFT Requires #10366 and #10367 to be merged. This PR contains those changes as well.
What changes were proposed in this pull request?
Switch SCM to use the new version manager added in #10367. This also makes changes to
SCMNodeManager, which is comparing Datanode and SCM versions to determine whether Datanodes should finalize. Handling for the full matrix of allowable Datanode versions based on SCM version and finalization state will be implemented in a later PR. Minor Recon changes were also made since Recon and SCM share some code around node management.The existing
FinalizationManager/FinalizationStateManagerclasses were kept to maintain consistency with other SCM ratis-based state managers like container/node/pipeline [state] manager. The scope of these was reduced soFinalizationManageris only responsible for upgrade finalization via ratis request or snapshot, and uses theScmVersionManagerinternally. All other version related queries useScmVersionManagerdirectly to be consistent with use in OM and Datanode and avoid unnecessary wrapper methods.What is the link to the Apache JIRA
HDDS-15377
How was this patch tested?
Existing upgrade finalization tests should pass. Some improvements were made to
TestScmHAFinalizationto clarify the conditions being waited on while SCM is finalizing.