Make sure _tier field handles missing setting #71439
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
When `_tier_preference` isn't set, getting it returns an empty string "". This PR updates the _tier metadata field to detect this case correctly.
jtibshirani
added
>non-issue
:Search/Search
|
Pinging @elastic/es-search (Team:Search) |
jtibshirani
commented
Apr 7, 2021
| @@ -53,7 +53,7 @@ protected boolean matches(String pattern, boolean caseInsensitive, SearchExecuti | |||
| pattern = Strings.toLowercaseAscii(pattern); | |||
| } | |||
| String tierPreference = DataTierAllocationDecider.INDEX_ROUTING_PREFER_SETTING.get(context.getIndexSettings().getSettings()); | |||
| if (tierPreference == null) { | |||
| if (Strings.hasText(tierPreference) == false) { | |||
There was a problem hiding this comment.
This check is a little unusual, but it matches how we test for the setting in other places like DataTierAllocationDecider.
cbuescher
approved these changes
Apr 8, 2021
| @@ -102,4 +117,18 @@ private SearchExecutionContext createContext() { | |||
| emptyMap() | |||
| ); | |||
| } | |||
|
|
|||
| private SearchExecutionContext createContextWithoutSetting() { | |||
There was a problem hiding this comment.
nit: maybe we could re-use the other createContext() method by adding an argument (e.g. a bool flag) to either return a context with- or without the setting?
There was a problem hiding this comment.
Thanks for the suggestion, I'll stick with this approach as I find it clearest right now. We can always refactor if these methods grow larger and there's more duplication!
jtibshirani
added a commit
that referenced
this pull request
Apr 8, 2021
When `_tier_preference` isn't set, getting it returns an empty string "". This PR updates the _tier metadata field to detect this case correctly.
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.
When
_tier_preferenceisn't set, getting it returns an empty string "". ThisPR updates the _tier metadata field to detect this case correctly.
Relates to #68135.