Skip to content

HDDS-15639. Adjust Upgrade status command to call OM intead of SCM#10579

Open
sodonnel wants to merge 6 commits into
apache:HDDS-14496-zdufrom
sodonnel:HDDS-15639
Open

HDDS-15639. Adjust Upgrade status command to call OM intead of SCM#10579
sodonnel wants to merge 6 commits into
apache:HDDS-14496-zdufrom
sodonnel:HDDS-15639

Conversation

@sodonnel

Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

Change the ozone admin upgrade status command to call OM and return a combined status of OM and HDDS finalization details.

What is the link to the Apache JIRA

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

How was this patch tested?

New unit tests

@github-actions github-actions Bot added the zdu Pull requests for Zero Downtime Upgrade (ZDU) https://issues.apache.org/jira/browse/HDDS-14496 label Jun 22, 2026

@dombizita dombizita 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.

Looks good to me, thanks for working on it @sodonnel! Two small comments, I'm fine with merging this way too.


String errOutput = errContent.toString(DEFAULT_ENCODING);
assertTrue(errOutput.contains("OM does not support ZDU"));
verify(omClient, never()).finalizeUpgrade();

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.

Shouldn't this check queryUpgradeStatus()?

Suggested change
verify(omClient, never()).finalizeUpgrade();
verify(omClient, never()).queryUpgradeStatus();

out().println("Upgrade status:");
out().println(" OM Finalized: " + status.getOmFinalized());
out().println(" SCM Finalized: " + status.getHddsStatus().getScmFinalized());
out().println(" Datanodes finalized: " + status.getHddsStatus().getNumDatanodesFinalized());

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.

Maybe it's worth to phrase it differently, as the first two line are true/false and this is the number of finalized datanodes, right?

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