Skip to content

HDDS-15716. Replace layout version protos with new version-named protos in the DN–SCM protocol - #10817

Merged
errose28 merged 4 commits into
apache:HDDS-14496-zdufrom
dombizita:HDDS-15716
Jul 27, 2026
Merged

HDDS-15716. Replace layout version protos with new version-named protos in the DN–SCM protocol#10817
errose28 merged 4 commits into
apache:HDDS-14496-zdufrom
dombizita:HDDS-15716

Conversation

@dombizita

@dombizitadombizita commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

The current proto uses the old terminology in the names. We will have one non-rolling upgrade before ZDU is released where we can deprecate this proto and switch to a new one without any extra compatibility handling.

In this patch I switched LayoutVersionProto to DatanodeVersionProto and FinalizeNewLayoutVersionCommandProto to FinalizeNewDatanodeVersionCommandProto.

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-15716

How was this patch tested?

Green CI on my fork: https://github.com/dombizita/ozone/actions/runs/29577100863

Used Claude Opus 4.8 for the refactoring, review and adjustments by me.

@dombizita
dombizita requested a review from errose28July 20, 2026 08:12
@github-actionsgithub-actionsBot added the zdu Pull requests for Zero Downtime Upgrade (ZDU) https://issues.apache.org/jira/browse/HDDS-14496 label Jul 20, 2026
errose28
errose28 reviewed Jul 20, 2026
View reviewed changes

@errose28errose28 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for adding this @dombizita. Most comments are minor, but there's some improvements we can do to existing behavior as well.

Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment thread...hadoop/ozone/container/common/statemachine/commandhandler/FinalizeVersionCommandHandler.java Outdated
Comment threadhadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto Outdated
Comment thread...rver-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java Outdated
Comment thread...rver-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java Outdated
errose28
errose28 approved these changes Jul 23, 2026
View reviewed changes

@errose28errose28 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Only nonfunctional comments on some stale commets/javadoc I found. Otherwise good to merge.

Comment threadhadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java Outdated
Comment threadhadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java Outdated
Comment threadhadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
Comment thread...g/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolServerSideTranslatorPB.java Outdated
errose28
errose28 approved these changes Jul 24, 2026
View reviewed changes

@errose28errose28 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Not sure what's going on with the current CI run. Looks like the runner ran out of space?

@errose28
errose28 merged commit 21b69d2 into apache:HDDS-14496-zduJul 27, 2026
131 of 133 checks passed
errose28 added a commit to errose28/ozone that referenced this pull request Jul 31, 2026
@errose28
Merge branch 'HDDS-14496-zdu' into worktree/scm-finalize-version-vali…
333d306
…dation
* HDDS-14496-zdu: (62 commits)
HDDS-15875. OM should validate software versions of peers before accepting finalize command (apache#10777)
HDDS-15417. Handle mixed datanode versions on the replication path (apache#10570)
HDDS-15716. Replace layout version protos with new version-named protos in the DN–SCM protocol (apache#10817)
HDDS-15715. Add helpful CLI flags to finalization CLIs (apache#10678)
HDDS-14687. Add test that OM can finalize from a snapshot (apache#10832)
HDDS-14580. Remove OM Prepare for Upgrade Code for ZDU (apache#9723)
HDDS-15848. Add new upgrade action annotations for component versions (apache#10744)
HDDS-15876. Remove ozone-csi (apache#10780)
HDDS-14825. Add Grafana Dashboard and Metrics for ZDU (apache#10602)
HDDS-15508. Add 2.2.0 to compatibility/upgrade test (apache#10782)
HDDS-15867. [JDK25] Bump byte-buddy to 1.18.11 (apache#10776)
HDDS-15809. Validate x-amz-copy-source-range on UploadPartCopy (apache#10711).
HDDS-15678. OFS isDirectory/isFile should not trigger pipeline refresh or return block locations (apache#10741)
HDDS-15171. Add available space check on follower during bootstrap. (apache#10185)
HDDS-14043. Fix ls -e UnsupportedOperationException on ofs/o3fs (apache#10209)
HDDS-15709. Replace random name suffix with uniqueObjectName (apache#10773)
HDDS-15677. Update client side version checks to use `isSupportedBy`. (apache#10611)
HDDS-15849. Force channel shutdown in XceiverClientGrpc.close (apache#10747)
HDDS-15765. Fail fast when --node-id is omitted for OM compact/defrag on an HA cluster (apache#10699)
HDDS-14989. Delay follower SCM DN server start until Ratis log catch-up. (apache#10617).
...
Conflicts:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@errose28errose28errose28 approved these changes

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dombizita@errose28