HDDS-14826. Prepare OM to switch from LayoutVersionManager to ComponentVersionManager#10098
Merged
errose28 merged 7 commits intoApr 27, 2026
Merged
Conversation
…d small cleanups - Add ComponentVersionManager / HDDSVersionManager / OMVersionManager and related upgrade framework pieces (no OM production wiring). - Move @DisallowedUntilLayoutVersion onto preExecute for snapshot move requests; minor DN/doc/repair/freon cleanups. - Include HDDS-side renames and SCM wiring updates that accompany the version-manager refactor (no functional change on the HDDS side). - Keep LayoutVersionManager + AbstractLayoutVersionManager implementing it until OM wiring PR (HDDS matches feature except those two files). - Include OM wire-compatibility/doc/deprecation proto tweaks, OMStorage apparent-version init alignment, finalize-upgrade response naming, and a comment clarification in OzoneManagerRequestHandler (no OM prod wiring).
…ntVersion() for PR1 compile Made-with: Cursor
…Version() for PR1 compile Made-with: Cursor
…age#getLayoutVersion Made-with: Cursor
…g PR Made-with: Cursor
…ng PR Made-with: Cursor
errose28
added
the
zdu
…pgrade result codes Made-with: Cursor
errose28
marked this pull request as ready for review
April 21, 2026 13:47
sodonnel
approved these changes
Apr 22, 2026
sodonnel
left a comment
sodonnel
left a comment
Contributor
There was a problem hiding this comment.
I think this looks OK. +1 to commit and we can rebase the next one on top.
dombizita
reviewed
Apr 27, 2026
| // TODO HDDS-14826: Register upgrade actions based on annotations | ||
| @Override | ||
| protected void runUpgradeAction(ComponentVersion componentVersion) throws UpgradeException { | ||
| // TODO HDDS-14826: Register upgrade actions based on annotations |
Contributor
There was a problem hiding this comment.
nit: change to the ticket that'll do this
Contributor
Author
There was a problem hiding this comment.
Thanks, will update this in the next PR. I actually haven't made the Jiras for the HDDS updates yet.
errose28
added a commit
to errose28/ozone
that referenced
this pull request
Apr 27, 2026
* HDDS-14496-zdu: HDDS-14826. Prepare OM to switch from LayoutVersionManager to ComponentVersionManager (apache#10098) HDDS-14896. Use separate container for clients in rolling-upgrade suite (apache#10032) HDDS-15034. Query SCM status for ozone admin upgrade status command (apache#10084) HDDS-14897. Add multiple S3 gateways to the rolling-upgrade suite (apache#10028) hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMStorage.java hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMStorage.java hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMUpgradeFinalizer.java
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
3 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.
What changes were proposed in this pull request?
This PR adds functionality and renames to prepare OM to be switched to the new versioning framework. This PR is intended to have no impact to production code and does not do any functional migration. It:
OMVersionManagerto load upgrade actions that correspond to different versions.HDDSVersionManager.OMVersionManagercan handle unknown or invalid apparent versions on startup and fixes an issue in this area.OM version framework migration is completed in #10099. Reference that PR to see how the changes here are used.
What is the link to the Apache JIRA
HDDS-14826
How was this patch tested?
All tests pass on my fork.
New unit tests were added for new version manager functionality like detecting invalid versions at startup and executing upgrade actions. Existing tests are expected to pass since the new version manager is not yet used in prod code.