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.
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
Modify config merging of non-'clickhouse' rooted configs. #52770
Merged
Conversation
This file contains 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
…rent root node names
yakov-olkhovskiy
changed the title
Modify config merging non-'clickhouse' rooted configs.
Modify config merging of non-'clickhouse' rooted configs.
Jul 29, 2023
robot-ch-test-poll2
added
the
pr-improvement
Pull request with some product improvements
label
Jul 29, 2023
This is an automated comment for commit 63b155a with description of existing statuses. It's updated for the latest CI running
|
alexey-milovidov
approved these changes
Jul 30, 2023
@cangyin unfortunately it's the only option to resolve this issue. This solution is limited for non-'clickhouse' rooted configs - for clickhouse assembly it will still produce a proper exception. |
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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
When merging into non-'clickhouse' rooted configuration, configs with different root node name just bypassed without exception.
Closes #50289
Closes #47485
Rationale:
Sometimes we want to assemble configs which have different than 'clickhouse' root node name - for example UDF configuration. According to logic besides immediate config file, we also traverse directories with '<file_name>.d' and 'conf.d' where merging file resides. Also we want to have the same root node name for merging configs. As a result, if we assemble non-'clickhouse' rooted configuration and 'conf.d' in the same directory contains differently rooted config, next exception will be produced:
This PR resolves this problem by bypassing all non-'clickhouse' rooted configs for non-'clickhouse' assemblies.