Correctly determine defaults of settings which depend on other settings #65989
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
This commit adjusts the behavior when calculating the diff between two `AbstractScopedSettings` objects, so that the default values of settings whose default values depend on the values of other settings are correctly calculated. Previously, when calculating the diff, the default value of a depended setting would be calculated based on the default value of the setting(s) it depends on, rather than the current value of those settings.
gwbrown
added
>bug
:Core/Infra/Settings
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
rjernst
approved these changes
Dec 8, 2020
| @@ -486,7 +486,11 @@ private T get(Settings settings, boolean validate) { | |||
| * @param defaultSettings the default settings object to diff against | |||
| */ | |||
| public void diff(Settings.Builder builder, Settings source, Settings defaultSettings) { | |||
| if (exists(source) == false) { | |||
| if (exists(source) == false && exists(defaultSettings) == false) { | |||
There was a problem hiding this comment.
I think this might read better if the outer "doesn't exist in source" stays the same and then have two inner conditions for "if (exists in defaults) X else Y"
gwbrown
added a commit
to gwbrown/elasticsearch
that referenced
this pull request
Dec 8, 2020
…gs (elastic#65989) This commit adjusts the behavior when calculating the diff between two `AbstractScopedSettings` objects, so that the default values of settings whose default values depend on the values of other settings are correctly calculated. Previously, when calculating the diff, the default value of a depended setting would be calculated based on the default value of the setting(s) it depends on, rather than the current value of those settings.
gwbrown
added a commit
to gwbrown/elasticsearch
that referenced
this pull request
Dec 8, 2020
…gs (elastic#65989) This commit adjusts the behavior when calculating the diff between two `AbstractScopedSettings` objects, so that the default values of settings whose default values depend on the values of other settings are correctly calculated. Previously, when calculating the diff, the default value of a depended setting would be calculated based on the default value of the setting(s) it depends on, rather than the current value of those settings.
gwbrown
added a commit
that referenced
this pull request
Dec 8, 2020
… settings (#65989) This commit adjusts the behavior when calculating the diff between two `AbstractScopedSettings` objects, so that the default values of settings whose default values depend on the values of other settings are correctly calculated. Previously, when calculating the diff, the default value of a depended setting would be calculated based on the default value of the setting(s) it depends on, rather than the current value of those settings.
gwbrown
added a commit
that referenced
this pull request
Dec 8, 2020
…settings (#65989) This commit adjusts the behavior when calculating the diff between two `AbstractScopedSettings` objects, so that the default values of settings whose default values depend on the values of other settings are correctly calculated. Previously, when calculating the diff, the default value of a depended setting would be calculated based on the default value of the setting(s) it depends on, rather than the current value of those settings.
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.
This commit adjusts the behavior when calculating the diff between two
AbstractScopedSettingsobjects, so that the default values of settingswhose default values depend on the values of other settings are
correctly calculated. Previously, when calculating the diff, the default
value of a depended setting would be calculated based on the default
value of the setting(s) it depends on, rather than the current value of
those settings.
Fixes #47890