Don't reset non-dynamic settings unless explicitly requested #21646
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
s1monw
added
:Core/Infra/Settings
AbstractScopedSettings has the ability to only apply updates/deletes to dynamic settings. The flag is currently not respected when a setting is reset/deleted which causes static node settings to be reset if a non-dynamic key is reset via `null` value. Closes elastic#21593
javanna
reviewed
Nov 18, 2016
| boolean changed = false; | ||
| for (String entry : deletes) { | ||
| Set<String> keysToRemove = new HashSet<>(); | ||
| Set<String> keySet = builder.internalMap().keySet(); | ||
| for (String key : keySet) { | ||
| if (Regex.simpleMatch(entry, key)) { | ||
| if (Regex.simpleMatch(entry, key) && canRemove.test(key)) { |
There was a problem hiding this comment.
given that we already check if we can remove before adding to the deletes set, do we still have to check it here?
There was a problem hiding this comment.
I added a comment in the code why we do this here
s1monw
added a commit
that referenced
this pull request
Nov 18, 2016
AbstractScopedSettings has the ability to only apply updates/deletes to dynamic settings. The flag is currently not respected when a setting is reset/deleted which causes static node settings to be reset if a non-dynamic key is reset via `null` value. Closes #21593
s1monw
added a commit
that referenced
this pull request
Nov 18, 2016
AbstractScopedSettings has the ability to only apply updates/deletes to dynamic settings. The flag is currently not respected when a setting is reset/deleted which causes static node settings to be reset if a non-dynamic key is reset via `null` value. Closes #21593
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.
AbstractScopedSettings has the ability to only apply updates/deletes
to dynamic settings. The flag is currently not respected when a setting
is reset/deleted which causes static node settings to be reset if a non-dynamic
key is reset via
nullvalue.Closes #21593