Test: don't modify defaultConfig on upgrade #55560
Merged
Conversation
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
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
mark-vieira
reviewed
Apr 22, 2020
|
|
||
| try { | ||
| Files.write( | ||
| configFile, | ||
| Stream.concat(settings.entrySet().stream(), defaultConfig.entrySet().stream()) | ||
| Stream.concat(settings.entrySet().stream(), baseConfig.entrySet().stream()) |
There was a problem hiding this comment.
I'm a bit confused. Is the configuration in defaultConfig not needed? ElasticsearchCluster.commonNodeConfig() places a bunch of stuff in there. Won't this change now no longer write those config items to the config file or am I missing something?
There was a problem hiding this comment.
On line 1052 we initialize baseConfig with defaultConfig:
Map<String, String> baseConfig = new HashMap<>(defaultConfig);
There was a problem hiding this comment.
That's indeed what I was missing.
stu-elastic
added a commit
to stu-elastic/elasticsearch
that referenced
this pull request
Apr 22, 2020
stu-elastic
added a commit
that referenced
this pull request
Apr 22, 2020
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.
Otherwise
defaultConfigon bwc tests is the union of allearlier configurations, which may have conflicting settings.