Skip to content

Trigger parent circuit breaker when building scorers in filters aggregation #102511

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 3 commits into from
Nov 23, 2023
Merged

Trigger parent circuit breaker when building scorers in filters aggregation #102511

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
8d3b1b2
Trigger parent circuit breaker when building scorers in filters aggre…
iverase Nov 23, 2023
615494f
Update docs/changelog/102511.yaml
iverase Nov 23, 2023
6dbecd1
Update docs/changelog/102511.yaml
iverase Nov 23, 2023
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
5 changes: 5 additions & 0 deletions docs/changelog/102511.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 102511
summary: Trigger parent circuit breaker when building scorers in filters aggregation
area: Aggregations
type: bug
issues: []
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ public final Function<byte[], Number> pointReaderIfAvailable(ValuesSourceConfig
* @return the cumulative size in bytes allocated by this aggregator to service this request
*/
protected long addRequestCircuitBreakerBytes(long bytes) {
// Only use the potential to circuit break if bytes are being incremented
if (bytes > 0) {
// Only use the potential to circuit break if bytes are being incremented, In the case of 0
// bytes, it will trigger the parent circuit breaker.
if (bytes >= 0) {
context.breaker().addEstimateBytesAndMaybeBreak(bytes, "<agg [" + name + "]>");
} else {
context.breaker().addWithoutBreaking(bytes);
Expand Down
6 changes: 6 additions & 0 deletions .../src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,17 @@ protected LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCt
final int numFilters = filters().size();
List<FilterMatchingDisiWrapper> filterWrappers = new ArrayList<>();
long totalCost = 0;
// trigger the parent circuit breaker to make sure we have enough heap to build the first scorer.
// note we might still fail if the scorer is huge.
addRequestCircuitBreakerBytes(0L);
for (int filterOrd = 0; filterOrd < numFilters; filterOrd++) {
Scorer randomAccessScorer = filters().get(filterOrd).randomAccessScorer(aggCtx.getLeafReaderContext());
if (randomAccessScorer == null) {
continue;
}
// scorer can take a fair amount of heap, and we have no means to estimate the size, so
// we trigger the parent circuit breaker to at least fail if we are running out of heap
addRequestCircuitBreakerBytes(0L);
totalCost += randomAccessScorer.iterator().cost();
filterWrappers.add(
randomAccessScorer.twoPhaseIterator() == null
Expand Down