HDDS-14805. Escape log4j variables in docker-compose templates#9930
Open
navinko wants to merge 2 commits intoapache:masterfrom
Open
HDDS-14805. Escape log4j variables in docker-compose templates#9930navinko wants to merge 2 commits intoapache:masterfrom
navinko wants to merge 2 commits intoapache:masterfrom
Conversation
Contributor
|
@navinko Thanks for the patch. I can see similar entries at hadoop-ozone/fault-injection-test/network-tests/src/test/compose/docker-config also. Can you check whether this change require here too? |
Contributor
Author
Thanks @priyeshkaratha for reviewing . I left that intensionally as was not able to test it . |
priyeshkaratha
approved these changes
Mar 18, 2026
Contributor
priyeshkaratha
left a comment
There was a problem hiding this comment.
Thanks @navinko for updating the patch. Changes LGTM
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?
This PR fixes an issue in the Ozone docker-compose templates where ${} patterns inside Log4j configuration were interpreted by docker-compose as environment variable substitutions.This change escapes the Log4j variable expressions in the docker-compose templates so that they are preserved and correctly interpreted by Log4j at runtime instead of being processed by docker-compose.
As per docker doc: https://github.com/docker/docs/blob/3c79e7c2ac175507a245f55602549e8cecc1b6e1/content/reference/compose-file/interpolation.md?plain=1#L40
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-14805
How was this patch tested?
CI : https://github.com/navinko/ozone/actions/runs/23208249818
#Before fix (Broken)
#After fix (Working)