Skip to content

Fix Scroll responds with 503 when no shards match #143532 #144589

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

Open
thiagosteps227 wants to merge 3 commits into
base: main
Choose a base branch
from
+58 −1
Open

Fix Scroll responds with 503 when no shards match #143532 #144589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd0db70
fix Scroll responds with 503 when no shards match #143532
thiagosteps227 Mar 19, 2026
3bba762
Merge branch 'main' into main
benchaplin Apr 8, 2026
bb561b8
Merge branch 'elastic:main' into main
thiagosteps227 Apr 9, 2026
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/action/search/SearchResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public SearchResponse(
this.timedOut = timedOut;
this.terminatedEarly = terminatedEarly;
this.numReducePhases = numReducePhases;
this.scrollId = scrollId;
this.scrollId = (totalShards > 0) ? scrollId : null;
this.pointInTimeId = pointInTimeId;
this.clusters = clusters;
this.totalShards = totalShards;
Expand Down
57 changes: 57 additions & 0 deletions server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.OriginalIndices;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.breaker.CircuitBreaker;
import org.elasticsearch.common.breaker.CircuitBreakingException;
Expand Down Expand Up @@ -539,6 +542,60 @@ public void testQueryConstructionMemoryReleasedOnContextClose() throws IOExcepti
}
}

public void testScrollIdKeptWhenShardsExist() {
String expectedScrollId = "FGluY2x1ZGVfY29udGV4dF91dWlkDnF1ZXJ5VGhlbkZldGNoAA==";
SearchHits emptyHits = new SearchHits(
new SearchHit[0],
new TotalHits(0, TotalHits.Relation.EQUAL_TO),
Float.NaN
);
SearchResponse response = new SearchResponse(
emptyHits,
null,
null,
false,
null,
null,
1,
expectedScrollId,
5, // totalShards > 0
5,
0,
100,
ShardSearchFailure.EMPTY_ARRAY,
null,
null,
null
);

assertEquals("scrollId should be preserved when totalShards > 0", expectedScrollId, response.getScrollId());
}

public void testScrollIdNullWhenNoShards() {
String providedScrollId = "scroll-id-should-be-null";
SearchHits emptyHits = new SearchHits(new SearchHit[0], new TotalHits(0, TotalHits.Relation.EQUAL_TO), 0f);
SearchResponse response = new SearchResponse(
emptyHits,
null,
null,
false,
null,
null,
1,
providedScrollId,
0, // totalShards == 0
2,
0,
100,
ShardSearchFailure.EMPTY_ARRAY,
null,
null,
null
);

assertNull("scrollId should be null when totalShards == 0", response.getScrollId());
}

private CircuitBreaker createQueryConstructionBreaker(String limit) {
Settings settings = Settings.builder()
.put(HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING.getKey(), limit)
Expand Down