Skip to content

HDDS-14896. Use separate container for clients in rolling-upgrade suite#10032

Merged
errose28 merged 11 commits intoapache:HDDS-14496-zdufrom
dombizita:HDDS-14896
Apr 27, 2026
Merged

HDDS-14896. Use separate container for clients in rolling-upgrade suite#10032
errose28 merged 11 commits intoapache:HDDS-14496-zdufrom
dombizita:HDDS-14896

Conversation

@dombizita
Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

Added a separate container for clients in rolling-upgrade suite, so a workaround can be removed, where we checked to not use for tests the SCM container which is currently restarted. To be able to run in an exact container the commands I added that parameter to the helper methods.

What is the link to the Apache JIRA

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

How was this patch tested?

CI on my fork with running the rolling restart test: https://github.com/dombizita/ozone/actions/runs/23915743686

@github-actions github-actions Bot added the zdu Pull requests for Zero Downtime Upgrade (ZDU) https://issues.apache.org/jira/browse/HDDS-14496 label Apr 2, 2026
@Russole
Copy link
Copy Markdown
Contributor

Russole commented Apr 5, 2026

Thanks @dombizita for working on this. The change looks good, LGTM!

Copy link
Copy Markdown
Contributor

@errose28 errose28 left a comment

Choose a reason for hiding this comment

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

Thanks for adding this. Just a few comments, and there are merge conflicts since the last acceptance test change went in.

Comment thread hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml Outdated
Comment thread hadoop-ozone/dist/src/main/compose/upgrade/compose/ha/docker-compose.yaml Outdated
Copy link
Copy Markdown
Contributor

@errose28 errose28 left a comment

Choose a reason for hiding this comment

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

LGTM, but there's a test failure in the networking. Not sure if it's intermittent.

--- RUNNING ROLLING UPGRADE TEST FROM 2.2.0 TO 2.2.0 ---
Using Docker Compose v2
--- SETTING UP OLD VERSION 2.2.0 ---
--- RUNNING WITH OLD VERSION 2.2.0 ---
Error response from daemon: failed to set up container networking: Address already in use

Copy link
Copy Markdown
Contributor

@errose28 errose28 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the updates.

@errose28 errose28 merged commit f639c57 into apache:HDDS-14496-zdu Apr 27, 2026
29 checks passed
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
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.

3 participants