Prevent order being lost for _nodes API filters #42045
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
order of these filters is kept.
astefan
added
the
:Distributed/Distributed
|
Pinging @elastic/es-distributed |
ywelsch
suggested changes
May 10, 2019
| boolean isMetricsOnly = ALLOWED_METRICS.containsAll(metricsOrNodeIds); | ||
| if (isMetricsOnly) { | ||
| nodeIds = new String[]{"_all"}; | ||
| metrics = metricsOrNodeIds; | ||
| } else { | ||
| nodeIds = metricsOrNodeIds.toArray(new String[]{}); | ||
| nodeIds = Strings.splitStringByCommaToArray(nodeId); |
There was a problem hiding this comment.
splitStringByCommaToArray does not trim whitespace I think whereas tokenizeByCommaToSet did . If we don't want to change the parsing, we should use tokenizeToStringArray here I think.
|
@ywelsch thanks. I made the change, but also in a second place where the same parsing method was used. |
astefan
added a commit
to astefan/elasticsearch
that referenced
this pull request
May 10, 2019
* Switch to using a list instead of a Set for the filters, so that the order of these filters is kept. (cherry picked from commit 74a7438)
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
May 10, 2019
* elastic/master: (84 commits) [ML] adds geo_centroid aggregation support to data frames (elastic#42088) Add documentation for calendar/fixed intervals (elastic#41919) Remove global checkpoint assertion in peer recovery (elastic#41987) Don't create tempdir for cli scripts (elastic#41913) Fix debian-8 update (elastic#42056) Cleanup plugin bin directories (elastic#41907) Prevent order being lost for _nodes API filters (elastic#42045) Change IndexAnalyzers default analyzer access (elastic#42011) Remove reference to fs.data.spins in docs Mute failing AsyncTwoPhaseIndexerTests Remove close method in PageCacheRecycler/Recycler (elastic#41917) [ML] adding pivot.max_search_page_size option for setting paging size (elastic#41920) Docs: Tweak list formatting Simplify handling of keyword field normalizers (elastic#42002) [ML] properly nesting objects in document source (elastic#41901) Remove extra `ms` from log message (elastic#42068) Increase the sample space for random inner hits name generator (elastic#42057) Recognise direct buffers in heap size docs (elastic#42070) shouldRollGeneration should execute under read lock (elastic#41696) Wait for active shard after close in mixed cluster (elastic#42029) ...
astefan
added a commit
that referenced
this pull request
May 10, 2019
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
* Switch to using a list instead of a Set for the filters, so that the order of these filters is kept.
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 PR fixes a bug that made the ordering of
nodeIds values to be lost. The order in which the node filters are specified is important as it dictates which nodes are being kept and which not in the list for which the metrics are retrieved.Fixes #41885.