HDDS-14956. Add S3 HAProxy to ozonesecure-ha test-haproxy-s3g.sh#10685
Merged
Conversation
Include s3-haproxy.yaml in the compose file set so the ozonesecure-ha suite exercises the HAProxy S3 gateway with three backend s3g workers. Make reorder_om_nodes tolerant of containers without bash (the HAProxy proxy uses haproxy:lts-alpine) by using POSIX sh, so its existing ozone-site.xml guard can skip non-ozone containers instead of aborting the test.
adoroszlai
approved these changes
Jul 8, 2026
Contributor
|
Thanks @chihsuan for the patch.
Can you please clarify if that applies to the patch itself, the PR description, or both? |
Contributor
Author
|
Thanks for the review! @adoroszlai @peterxcli
The PR description 🙂 |
Contributor
|
Thanks @chihsuan for the patch, @peterxcli for the review. |
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
3 participants
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?
HDDS-12113 moved the S3 HAProxy tests into the HA environments, but
ozonesecure-ha/test-haproxy-s3g.shnever setCOMPOSE_FILE, so it ran against a singles3gand never starteds3-haproxy.yaml. TheHA-securesuite exercised the test without actually routing S3 traffic through HAProxy.ozonesecure-ha/test-haproxy-s3g.sh: setCOMPOSE_FILE=docker-compose.yaml:s3-haproxy.yamlto start the HAProxy proxy and three backends3gworkers.testlib.sh(reorder_om_nodes): use POSIXshinstead ofbash. Thehaproxy:lts-alpineproxy has nobash, so the per-containerdocker execfailed with exit 127 and aborted the run underset -e.shlets the existingozone-site.xmlguard skip non-Ozone containers; behavior is unchanged elsewhere.What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-14956
How was this patch tested?
ozonesecure-ha/test-haproxy-s3g.sh: 131/131 S3 robot tests passed, now with the HAProxy proxy and three backends.s3g:9878round-robined 4/4/4 across the backends, logged with the HAProxy container IP as source.bats.shpassed.Generated-by: Claude Code (Opus 4.8)