Skip to content

HDDS-15375. Renames to prepare to switch SCM to the new versioning framework.#10366

Merged
errose28 merged 2 commits into
apache:HDDS-14496-zdufrom
errose28:scm-version-renames
May 27, 2026
Merged

HDDS-15375. Renames to prepare to switch SCM to the new versioning framework.#10366
errose28 merged 2 commits into
apache:HDDS-14496-zdufrom
errose28:scm-version-renames

Conversation

@errose28
Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

  • Rename FUTURE_VERSION to UNKNOWN_VERSION in HDDSVersion and OzoneManagerVersion.

    • This provides a clearer fallback for when an unknown version is encountered on the disk within the server.
  • Rename methods and variables using LayoutVersion terminology as needed since the term "layout version" will not be used going forward.

What is the link to the Apache JIRA

HDDS-15375

How was this patch tested?

No functional change. All existing tests should pass.

…inology

Co-authored-by: Cursor <cursoragent@cursor.com>
@errose28 errose28 requested review from dombizita and sodonnel May 26, 2026 21:10
@github-actions github-actions Bot added the zdu Pull requests for Zero Downtime Upgrade (ZDU) https://issues.apache.org/jira/browse/HDDS-14496 label May 26, 2026
Copy link
Copy Markdown
Contributor

@sodonnel sodonnel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change LGTM - are we ready to move it out of draft?

@errose28
Copy link
Copy Markdown
Contributor Author

Some flaky upgrade related test showed up that I can't repro locally yet. I'd be surprised if it was caused by this but let me root cause it first.

@errose28
Copy link
Copy Markdown
Contributor Author

Nevermind, not flaky I just had the wrong branch checked out. testNormalContainerUpgrade is failing because this PR changes the default version in DatanodeStorage from maxLayoutVersion (old HDDS layout version 10) to HDDSVersion.SOFTWARE_VERSION (new software version 100) without actually switching to the new version manager. Looks like this slipped in as part of the renames since I used AI to extract the rename-only changes from my development branch. I'll move that change to #10368 where it belongs. Relevant tests are passing on that PR's branch.

@errose28 errose28 marked this pull request as ready for review May 27, 2026 15:23
@errose28 errose28 requested a review from sodonnel May 27, 2026 18:13
@errose28 errose28 merged commit fb96f08 into apache:HDDS-14496-zdu May 27, 2026
61 checks passed
errose28 added a commit to errose28/ozone that referenced this pull request May 27, 2026
* HDDS-14496-zdu:
  HDDS-15375. Renames to prepare to switch SCM to the new versioning framework. (apache#10366)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

zdu Pull requests for Zero Downtime Upgrade (ZDU) https://issues.apache.org/jira/browse/HDDS-14496

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants