HDDS-14897. Add multiple S3 gateways to the rolling-upgrade suite#10028
Open
dombizita wants to merge 3 commits intoapache:HDDS-14496-zdufrom
Open
HDDS-14897. Add multiple S3 gateways to the rolling-upgrade suite#10028dombizita wants to merge 3 commits intoapache:HDDS-14496-zdufrom
dombizita wants to merge 3 commits intoapache:HDDS-14496-zdufrom
Conversation
adoroszlai
reviewed
Apr 2, 2026
Contributor
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @dombizita, LGTM.
| export SECURITY_ENABLED="true" | ||
|
|
||
| create_data_dirs dn{1..5} kms om{1..3} recon s3g scm{1..3} | ||
| create_data_dirs dn{1..5} kms om{1..3} recon s3g s3g{1..3} scm{1..3} |
Contributor
There was a problem hiding this comment.
nit: s3g data dir is no longer used, but it's harmless, no need to update patch just for this.
| sed -i -e 's/om1,om2,om3/${new_order}/' /etc/hadoop/ozone-site.xml; \ | ||
| echo 'Replaced OM order with ${new_order} in ${c}'; \ | ||
| fi" | ||
| fi" || true |
Contributor
There was a problem hiding this comment.
silently swallow genuine bash failures
This is fine. In the worst case OM client will contact follower first with the original order.
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
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?
Use HA Proxy to load balance multiple S3 gateways. I did the necessary changes in
docker-compose.yamland adjusted the shell scripts for that. I didn't use the existings3-haproxy.yaml, as the one in common was not working out of the box with the Ozone HA setup (also found HDDS-14956). As this suite always need to have multiple S3 gateways I think it's okay to have it in thedocker-compose.yaml.One outstanding change is in the
hadoop-ozone/dist/src/main/compose/testlib.sh. Without that change I faced this error:Cursor help: "This is from reorder_om_nodes in testlib.sh. It iterates over ALL containers and runs docker exec ... bash -c "...". The HAProxy container (ha-s3g-1) uses haproxy:lts-alpine — Alpine Linux — which only has sh, not bash."
This is new, as Ozone HA suite never used S3 HAProxy setup before and if it's not Ozone HA we are not calling
reorder_om_nodes. This fix will simply skip it and as the ha proxy container doesn't needozone-site.xml, it's safe to do this. The downside is it would also silently swallow genuine bash failures. Another solution is to useshinstead ofbashWhat is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-14897
How was this patch tested?
CI with the rolling upgrade test suite: https://github.com/dombizita/ozone/actions/runs/23846523428
With commenting out (current state on HDDS-14496-zdu): https://github.com/dombizita/ozone/actions/runs/23846562903