Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
May 14, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions hadoop-ozone/dist/src/main/compose/ozone-ha/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ x-common-config:
env_file:
- docker-config

x-replication:
&replication
x-environment:
&environment
OZONE_OPTS:
OZONE-SITE.XML_ozone.server.default.replication: ${OZONE_REPLICATION_FACTOR:-1}

services:
Expand All @@ -34,14 +35,14 @@ services:
- 19864
- 9882
environment:
<<: *replication
<<: *environment
command: ["ozone","datanode"]
om1:
<<: *common-config
environment:
WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
<<: *environment
ports:
- 9874:9874
- 9862
Expand All @@ -52,7 +53,7 @@ services:
environment:
WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
<<: *environment
ports:
- 9874
- 9862
Expand All @@ -63,7 +64,7 @@ services:
environment:
WAITFOR: scm3:9894
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
<<: *environment
ports:
- 9874
- 9862
Expand All @@ -76,7 +77,7 @@ services:
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
<<: *environment
command: ["ozone","scm"]
scm2:
<<: *common-config
Expand All @@ -86,7 +87,7 @@ services:
WAITFOR: scm1:9894
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
<<: *environment
command: ["ozone","scm"]
scm3:
<<: *common-config
Expand All @@ -96,20 +97,20 @@ services:
WAITFOR: scm2:9894
ENSURE_SCM_BOOTSTRAPPED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
<<: *environment
command: ["ozone","scm"]
httpfs:
<<: *common-config
environment:
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
<<: *environment
ports:
- 14000:14000
command: [ "ozone","httpfs" ]
s3g:
<<: *common-config
environment:
<<: *replication
<<: *environment
ports:
- 9878:9878
command: ["ozone","s3g"]
Expand All @@ -118,5 +119,5 @@ services:
ports:
- 9888:9888
environment:
<<: *replication
<<: *environment
command: ["ozone","recon"]
66 changes: 28 additions & 38 deletions hadoop-ozone/dist/src/main/compose/ozonescripts/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,32 @@
# See the License for the specific language governing permissions and
# limitations under the License.

x-common-config:
&common-config
build:
context: .
args:
- OZONE_RUNNER_IMAGE
- OZONE_RUNNER_VERSION
env_file:
- ./docker-config
environment:
OZONE_OPTS:
volumes:
- ../..:/opt/hadoop

services:
datanode:
build:
context: .
args:
- OZONE_RUNNER_IMAGE
- OZONE_RUNNER_VERSION
volumes:
- ../..:/opt/hadoop
ports:
- 19864
env_file:
- ./docker-config
om:
build:
context: .
args:
- OZONE_RUNNER_IMAGE
- OZONE_RUNNER_VERSION
volumes:
- ../..:/opt/hadoop
ports:
- 9874:9874
- 9862:9862
env_file:
- ./docker-config
scm:
build:
context: .
args:
- OZONE_RUNNER_IMAGE
- OZONE_RUNNER_VERSION
volumes:
- ../..:/opt/hadoop
ports:
- 9876:9876
- 9860:9860
env_file:
- ./docker-config
datanode:
<<: *common-config
ports:
- 19864
om:
<<: *common-config
ports:
- 9874:9874
- 9862:9862
scm:
<<: *common-config
ports:
- 9876:9876
- 9860:9860
3 changes: 2 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ services:
- 9862:9862
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
OZONE_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
OZONE_OM_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
OZONE_OPTS:
command: ["/opt/hadoop/bin/ozone","om"]
httpfs:
<<: *common-config
Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure/vault.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ services:
env_file:
- vault.conf
environment:
- OZONE_OPTS=-Dcom.sun.net.ssl.checkRevocation=false
Copy link
Copy Markdown
Contributor

@ChenSammi ChenSammi May 14, 2026 •
edited
Loading

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

@adoroszlai adoroszlai May 14, 2026

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.

- OZONE_MANAGER_CLASSPATH=/opt/hadoop/share/ozone/lib/ozone-s3-secret-store-@project.version@.jar:/opt/hadoop/share/ozone/lib/vault-java-driver-@vault.driver.version@.jar
vault:
image: hashicorp/vault:1.13.2
Expand Down
15 changes: 8 additions & 7 deletions hadoop-ozone/dist/src/main/compose/restart/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ x-common-config:
- docker-config
image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}

x-replication:
&replication
x-environment:
&environment
OZONE_OPTS:
OZONE-SITE.XML_ozone.server.default.replication: ${OZONE_REPLICATION_FACTOR:-1}

x-datanode:
&datanode
command: ["ozone","datanode"]
<<: *common-config
environment:
<<: *replication
<<: *environment
ports:
- 19864
- 9882
Expand Down Expand Up @@ -68,7 +69,7 @@ services:
<<: *common-config
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
<<: *replication
<<: *environment
networks:
net:
ipv4_address: 10.9.0.14
Expand All @@ -83,7 +84,7 @@ services:
command: ["ozone","recon"]
<<: *common-config
environment:
<<: *replication
<<: *environment
networks:
net:
ipv4_address: 10.9.0.15
Expand All @@ -97,7 +98,7 @@ services:
command: ["ozone","s3g"]
<<: *common-config
environment:
<<: *replication
<<: *environment
networks:
net:
ipv4_address: 10.9.0.16
Expand All @@ -113,7 +114,7 @@ services:
environment:
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
<<: *replication
<<: *environment
networks:
net:
ipv4_address: 10.9.0.17
Expand Down
3 changes: 2 additions & 1 deletion hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ services:
hostname: om
environment:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
OZONE_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
OZONE_OM_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
OZONE_OPTS:
ports:
- 9874:9874
- 9862:9862
Expand Down