Fix race condition when resolving new location for multiple shards at once #128062
Conversation
This file contains hidden or 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
idegtiarenko
added
>non-issue
Team:Analytics
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
idegtiarenko
commented
May 14, 2025
| for (ShardId shardId : pendingShardIds) { | ||
| if (targetShards.getShard(shardId).remainingNodes.isEmpty()) { | ||
| if (targetShards.getShard(shardId).remainingNodes.isEmpty() | ||
| && (isRetryableFailure(shardFailures.get(shardId)) == false || pendingRetries.contains(shardId))) { |
Contributor
Author
There was a problem hiding this comment.
It was previously possible that between executing line 195 and line 206 one of the data nodes returns with NoSuchShard exception and add a new pendingShardId. As a result such shard might still not have remainingNodes nodes to query. This change supposed to detect such situations and delay such resolution to the next round.
This was detected by testSearchWhileRelocating integration test that is fairly slow and expensive so I added testRetryMultipleMovedShards unit test that made it much easier to reproduce.
idegtiarenko
added
the
auto-backport
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
idegtiarenko
added a commit
to idegtiarenko/elasticsearch
that referenced
this pull request
May 20, 2025
… once (elastic#128062) (cherry picked from commit f4b6086)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 fixes the race condition when retrying resolving multiple moved shards at once.
Please see inline comments for more details.
Related to: #127188
Closes: #128082