Fix index filtering in follow info api. #37752
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
The filtering by follower index was completely broken. Also the wrong persistent tasks were selected, causing the wrong status to be reported. Closes elastic#37738
martijnvg
added
>non-issue
v7.0.0
:Distributed Indexing/CCR
martijnvg
changed the title
|
@elasticmachine run elasticsearch-ci/1 |
dnhatn
reviewed
Jan 23, 2019
| Map<String, String> ccrCustomData = indexMetaData.getCustomData(Ccr.CCR_CUSTOM_METADATA_KEY); | ||
| if (ccrCustomData != null) { | ||
| Optional<ShardFollowTask> result; | ||
| if (persistentTasks != null) { | ||
| result = persistentTasks.taskMap().values().stream() | ||
| .map(persistentTask -> (ShardFollowTask) persistentTask.getParams()) | ||
| .filter(shardFollowTask -> concreteFollowerIndices.isEmpty() || | ||
| concreteFollowerIndices.contains(shardFollowTask.getFollowShardId().getIndexName())) | ||
| .filter(shardFollowTask -> index.equals(shardFollowTask.getFollowShardId().getIndexName())) |
There was a problem hiding this comment.
I think we need to filter ShardFollowTask task before casting. Maybe use persistentTasks.findTasks API.
I will make a PR to inject other persistent tasks randomly in our IT tests.
There was a problem hiding this comment.
Good catch! I will use that method instead.
I will make a PR to inject other persistent tasks randomly in our IT tests.
👍
|
@dnhatn I've updated the PR. |
martijnvg
added a commit
that referenced
this pull request
Jan 24, 2019
The filtering by follower index was completely broken. Also the wrong persistent tasks were selected, causing the wrong status to be reported. Closes #37738
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Jan 24, 2019
* elastic/master: Optimize warning header de-duplication (elastic#37725) Bubble exceptions up in ClusterApplierService (elastic#37729) SQL: Improve handling of invalid args for PERCENTILE/PERCENTILE_RANK (elastic#37803) Remove unused ThreadBarrier class (elastic#37666) Add built-in user and role for code plugin (elastic#37030) Consolidate testclusters tests into a single project (elastic#37362) Fix docs for MappingUpdatedAction SQL: Introduce SQL DATE data type (elastic#37693) disabling bwc test while backporting elastic#37639 Mute ClusterDisruptionIT testAckedIndexing Set acking timeout to 0 on dynamic mapping update (elastic#31140) Remove index audit output type (elastic#37707) Mute FollowerFailOverIT testReadRequestsReturnsLatestMappingVersion [ML] Increase close job timeout and lower the max number (elastic#37770) Remove Custom Listeners from SnapshotsService (elastic#37629) Use m_m_nodes from Zen1 master for Zen2 bootstrap (elastic#37701) Fix index filtering in follow info api. (elastic#37752) Use project dependency instead of substitutions for distributions (elastic#37730) Update authenticate to allow unknown fields (elastic#37713) Deprecate HLRC EmptyResponse used by security (elastic#37540)
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.
The filtering by follower index was completely broken.
Also the wrong persistent tasks were selected, causing the
wrong status to be reported.
The fix itself is small, but this PR adds more tests.
Closes #37738
Note: marking this issue as non-issue (instead of a bug), because the follow info api has not been released yet.