Do not use split shards for search and refresh if they are not ready #132042
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,8 @@ | |
|
|
||
| import org.elasticsearch.cluster.ProjectState; | ||
| import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
| import org.elasticsearch.cluster.metadata.IndexReshardingMetadata; | ||
| import org.elasticsearch.cluster.metadata.IndexReshardingState; | ||
| import org.elasticsearch.cluster.metadata.ProjectMetadata; | ||
| import org.elasticsearch.cluster.node.DiscoveryNodes; | ||
| import org.elasticsearch.common.Strings; | ||
|
|
@@ -26,6 +28,7 @@ | |
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashSet; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
@@ -112,6 +115,10 @@ public List<ShardIterator> searchShards( | |
| return res; | ||
| } | ||
|
|
||
| public Iterator<IndexShardRoutingTable> allWritableShards(ProjectState projectState, String index) { | ||
| return allShardsReadyForWrites(projectState, index); | ||
| } | ||
|
|
||
| public static ShardIterator getShards(RoutingTable routingTable, ShardId shardId) { | ||
| final IndexShardRoutingTable shard = routingTable.shardRoutingTable(shardId); | ||
| return shard.activeInitializingShardsRandomIt(); | ||
|
|
@@ -125,7 +132,7 @@ private static Set<IndexShardRoutingTable> computeTargetedShards( | |
| // we use set here and not list since we might get duplicates | ||
| final Set<IndexShardRoutingTable> set = new HashSet<>(); | ||
| if (routing == null || routing.isEmpty()) { | ||
| collectTargetShardsNoRouting(projectState, concreteIndices, set); | ||
| } else { | ||
| collectTargetShardsWithRouting(projectState, concreteIndices, routing, set); | ||
|
There was a problem hiding this comment. how is this branch resolving target shards to source shards before split? There was a problem hiding this comment. Is the There was a problem hiding this comment. This is handled inside There was a problem hiding this comment. Ok, but what about this codepath in There was a problem hiding this comment. Yes, it should, thanks for catching that. |
||
| } | ||
|
|
@@ -154,13 +161,53 @@ private static void collectTargetShardsWithRouting( | |
| } | ||
| } | ||
|
|
||
| private static void collectTargetShardsNoRouting(ProjectState projectState, String[] concreteIndices, Set<IndexShardRoutingTable> set) { | ||
| for (String index : concreteIndices) { | ||
| Iterator<IndexShardRoutingTable> iterator = allShardsReadyForSearch(projectState, index); | ||
| while (iterator.hasNext()) { | ||
| set.add(iterator.next()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns an iterator of shards of the index that are ready to execute search requests. | ||
| * A shard may not be ready to execute these operations during processes like resharding. | ||
| */ | ||
| private static Iterator<IndexShardRoutingTable> allShardsReadyForSearch(ProjectState projectState, String index) { | ||
| return allShardsExceptSplitTargetsInStateBefore(projectState, index, IndexReshardingState.Split.TargetShardState.SPLIT); | ||
| } | ||
|
|
||
| /** | ||
| * Returns an iterator of shards of the index that are ready to execute write requests. | ||
| * A shard may not be ready to execute these operations during processes like resharding. | ||
| */ | ||
| private static Iterator<IndexShardRoutingTable> allShardsReadyForWrites(ProjectState projectState, String index) { | ||
|
||
| return allShardsExceptSplitTargetsInStateBefore(projectState, index, IndexReshardingState.Split.TargetShardState.HANDOFF); | ||
| } | ||
|
|
||
| private static Iterator<IndexShardRoutingTable> allShardsExceptSplitTargetsInStateBefore( | ||
|
There was a problem hiding this comment. Can we add a comment here so the reader knows it is associated with resharding and not to be confused with the split API. There was a problem hiding this comment. I think that class level documentation on |
||
| ProjectState projectState, | ||
| String index, | ||
| IndexReshardingState.Split.TargetShardState targetShardState | ||
| ) { | ||
| final IndexRoutingTable indexRoutingTable = indexRoutingTable(projectState.routingTable(), index); | ||
| final IndexMetadata indexMetadata = indexMetadata(projectState.metadata(), index); | ||
| if (indexMetadata.getReshardingMetadata() == null) { | ||
| return indexRoutingTable.allShards().iterator(); | ||
| } | ||
|
|
||
| final IndexReshardingMetadata indexReshardingMetadata = indexMetadata.getReshardingMetadata(); | ||
| assert indexReshardingMetadata.isSplit(); | ||
| final IndexReshardingState.Split splitState = indexReshardingMetadata.getSplit(); | ||
|
|
||
| var shards = new ArrayList<IndexShardRoutingTable>(); | ||
| for (int i = 0; i < indexRoutingTable.size(); i++) { | ||
| if (splitState.isTargetShard(i) == false || splitState.targetStateAtLeast(i, targetShardState)) { | ||
| shards.add(indexRoutingTable.shard(i)); | ||
| } | ||
| } | ||
| return shards.iterator(); | ||
| } | ||
|
|
||
| private ShardIterator preferenceActiveShardIterator( | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I don't know how expensive a projectResolver is but perhaps it's a little cheaper to resolve once and then retrieve ProjectMetadata from projectState.metadata() ?