idxmgmt: fix config merging #4950
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
axw
force-pushed
the
fix-template-config-merge
branch
from
01ac31c
to
aa573e3
Compare
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
|
jenkins run the tests please |
simitt
reviewed
Mar 11, 2021
| // resolved using the root of the left-most config in the merge. | ||
| // We merge the user-defined config back over the defaults to | ||
| // ensure they take precedence. | ||
| return common.MergeConfigs(configRoot, defaultConfig, configRoot) |
There was a problem hiding this comment.
This looks complicated - looking at the common.MergeConfigs code I couldn't figure out why we need the extra configRoot.
There was a problem hiding this comment.
Agreed, hence the NOTE :)
Is the comment unclear?
There was a problem hiding this comment.
I tweaked the comment slightly, hopefully it's a bit clearer now.
|
Just found a bug, moving back into draft while I fx. |
Check before we merge, and use config.Has rather than unpacking twice.
simitt
approved these changes
Mar 16, 2021
axw
added a commit
to axw/apm-server
that referenced
this pull request
Mar 16, 2021
* idxmgmt: fix config merging * Fix how we determine setup.template specified Check before we merge, and use config.Has rather than unpacking twice. * systemtest: improve logging for assertion # Conflicts: # changelogs/head.asciidoc
axw
added a commit
to axw/apm-server
that referenced
this pull request
Mar 16, 2021
* idxmgmt: fix config merging * Fix how we determine setup.template specified Check before we merge, and use config.Has rather than unpacking twice. * systemtest: improve logging for assertion # Conflicts: # changelogs/head.asciidoc
axw
added a commit
to axw/apm-server
that referenced
this pull request
Mar 16, 2021
* idxmgmt: fix config merging * Fix how we determine setup.template specified Check before we merge, and use config.Has rather than unpacking twice. * systemtest: improve logging for assertion # Conflicts: # changelogs/head.asciidoc
axw
added a commit
that referenced
this pull request
Mar 16, 2021
axw
added a commit
that referenced
this pull request
Mar 16, 2021
axw
added a commit
that referenced
this pull request
Mar 16, 2021
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.
Motivation/summary
Fix a bug related to merging user-defined and default
setup.templateconfig.We were merging onto a new config, which meant root config attributes like
path.configwere no longer accessible. The fix is to merge defaults over the root config to ensure the root config attributes are still accessible, and then merge the root config back over that to ensure user-defined config takes precedence.Checklist
How to test these changes
See #4949
Related issues
Fixes #4949