Skip to content

Avoid walking the complete list of search contexts on shard creation #123855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 14, 2025
Merged

Avoid walking the complete list of search contexts on shard creation #123855

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba047e4
Avoid walking the complete list of search contexts on shard creation
original-brownbear Mar 3, 2025
2620b2e
Merge branch 'main' into avoid-walking-all-contexts
original-brownbear Apr 10, 2025
546a0d8
Merge branch 'main' into avoid-walking-all-contexts
original-brownbear Apr 10, 2025
d72a0c0
Merge branch 'main' into avoid-walking-all-contexts
original-brownbear Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/search/SearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.elasticsearch.action.support.TransportActions;
import org.elasticsearch.cluster.ProjectState;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver.ResolvedExpression;
import org.elasticsearch.cluster.routing.RecoverySource;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.CheckedSupplier;
Expand Down Expand Up @@ -531,7 +532,7 @@ public void beforeIndexShardCreated(ShardRouting routing, Settings indexSettings
// to stop searches to restore full availability as fast as possible. A known scenario here is that we lost connection to master
// or master(s) were restarted.
assert routing.initializing();
if (routing.isRelocationTarget() == false) {
if (routing.isRelocationTarget() == false && routing.recoverySource() != RecoverySource.EmptyStoreRecoverySource.INSTANCE) {
freeAllContextsForShard(routing.shardId());
}
}
Expand Down