Rework ShardSearchContextId to explain use of searcher id better#135233
Merged
cbuescher merged 5 commits intoelastic:mainfrom Sep 25, 2025
Merged
Rework ShardSearchContextId to explain use of searcher id better#135233cbuescher merged 5 commits intoelastic:mainfrom
cbuescher merged 5 commits intoelastic:mainfrom
Conversation
When a ShardSearchContextId holds a searcher id, this indicates that the searcher backing the context is stable so we can retry a shard on a differnt node if the original context is gone (e.g. due to node restarts). We use these searcher ids only the case for PIT contexts and only if the underlying engine supports it (e.g. currently only FrozenEngine and ReadOnlyEngine). This change moves that decision logic into ShardSearchContextId itself because there is no need to expose the search id once its set. By renaming the access methods we can also communicate the intended use of these ids better.
Collaborator
|
Pinging @elastic/es-search-foundations (Team:Search Foundations) |
piergm
approved these changes
Sep 25, 2025
Member
piergm
left a comment
There was a problem hiding this comment.
The changes LGTM, I only added a small comment that's more of a personal preference than anything.
server/src/main/java/org/elasticsearch/search/SearchService.java
Outdated
Show resolved
Hide resolved
Member
Author
|
@piergm thanks for the review |
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Sep 25, 2025
…-dls * upstream/main: (100 commits) ES|QL: Add FUSE operator tests (elastic#135307) [D0CS] Revise connector setup steps in documentation (elastic#135426) Fix DiscoveryDisruptionIT.testElectMasterWithLatestVersion (elastic#135396) [DOCS] Marks the change point agg as GA (elastic#134898) Rework ShardSearchContextId to explain use of searcher id better (elastic#135233) [CI] Handle caching bwc dependencies more gracefully (elastic#135417) Mute org.elasticsearch.gradle.TestClustersPluginFuncTest override jdk usage via ES_JAVA_HOME for known jdk os incompatibilities elastic#135413 [Build] update eclipse formatter used by spotless (elastic#135382) [Test] Fix typo in build tool tests (elastic#135405) Fixes testSnapshotShutdownProgressTracker (elastic#134926) Mute org.elasticsearch.upgrades.StandardToLogsDbIndexModeRollingUpgradeIT testLogsIndexing {upgradedNodes=1} elastic#135313 OTLP: remove feature flag (elastic#135401) [Docs] Convert asciidoc lifecycle markers into Docs V3 syntax (elastic#135347) Mute org.elasticsearch.upgrades.QueryableBuiltInRolesUpgradeIT testBuiltInRolesSyncedOnClusterUpgrade elastic#135194 Mute org.elasticsearch.upgrades.IndexingIT testIndexing elastic#135407 Mute org.elasticsearch.upgrades.DataStreamsUpgradeIT testDataStreamValidationDoesNotBreakUpgrade elastic#135406 [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (elastic#135399) [Build] Update checkstyle from 10.3 to 11.0.1 (elastic#135381) Mute org.elasticsearch.upgrades.TextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135238 Mute org.elasticsearch.upgrades.MatchOnlyTextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135325 ...
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
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.
When a ShardSearchContextId holds a searcher id, this indicates that the searcher backing the context is stable so we can retry a shard on a differnt node if the original context is gone (e.g. due to node restarts).
We use these searcher ids only the case for PIT contexts and only if the underlying engine supports it (e.g. currently only FrozenEngine and ReadOnlyEngine).
This change moves that decision logic into ShardSearchContextId itself because there is no need to expose the search id once its set. By renaming the access methods we can also communicate the intended use of these ids better.