Skip to content

HDDS-15254. Pass OZONE_OPTS to more containers to ensure coverage collection#10262

Merged
adoroszlai merged 1 commit into
apache:masterfrom
adoroszlai:HDDS-15254
May 14, 2026
Merged

HDDS-15254. Pass OZONE_OPTS to more containers to ensure coverage collection#10262
adoroszlai merged 1 commit into
apache:masterfrom
adoroszlai:HDDS-15254

Conversation

@adoroszlai
Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

Acceptance tests send coverage data via jacoco-agent, defined in OZONE_OPTS:

export OZONE_OPTS="-javaagent:share/coverage/jacoco-agent.jar=output=tcpclient,address=$DOCKER_BRIDGE_IP,includes=org.apache.hadoop.ozone.*:org.apache.hadoop.hdds.*:org.apache.hadoop.fs.ozone.*:org.apache.ozone.*:org.apache.hadoop.ipc_.*:org.apache.hadoop.security_.*"

For this we pass OZONE_OPTS from local environment to containers (using the syntax OZONE_OPTS: without value). This was missing in some compose definitions, and overwritten with different value in few specific cases, before this PR.

Adding it increases coverage for code paths that are only tested in acceptance check, e.g. Vault integration.

1-before

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

How was this patch tested?

2-after

CI:
https://github.com/adoroszlai/ozone/actions/runs/25795532236

env_file:
- vault.conf
environment:
- OZONE_OPTS=-Dcom.sun.net.ssl.checkRevocation=false
Copy link
Copy Markdown
Contributor

@ChenSammi ChenSammi May 14, 2026

Choose a reason for hiding this comment

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

Shall we also rename this to OZONE_OM_OPTS, instead of remove it, and add a new OZONE_OPTS too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is being removed because the config is already defined in the base compose file (docker-compose.yaml). vault.yaml adds configs on top of that.

It was originally added for Vault, then added to the base file for some other project.

Copy link
Copy Markdown
Contributor

@dombizita dombizita 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 this improvement (and reducing the code) @adoroszlai, looks good to me!

@adoroszlai adoroszlai merged commit c0ba28f into apache:master May 14, 2026
32 of 33 checks passed
@adoroszlai adoroszlai deleted the HDDS-15254 branch May 14, 2026 13:04
@adoroszlai
Copy link
Copy Markdown
Contributor Author

Thanks @ChenSammi, @dombizita for the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants