Skip to content
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

[8.15] Always check the parent breaker with zero bytes in PreallocatedCircuitBreakerService (#115181) #115272

Merged
merged 1 commit into from
Oct 21, 2024
Merged

[8.15] Always check the parent breaker with zero bytes in PreallocatedCircuitBreakerService (#115181) #115272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/115181.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 115181
summary: Always check the parent breaker with zero bytes in `PreallocatedCircuitBreakerService`
area: Aggregations
type: bug
issues: []
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/common/breaker/PreallocatedCircuitBreakerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public void addEstimateBytesAndMaybeBreak(long bytes, String label) throws Circu
if (closed) {
throw new IllegalStateException("already closed");
}
if (preallocationUsed == preallocated) {
// Preallocation buffer was full before this request
if (preallocationUsed == preallocated || bytes == 0L) {
// Preallocation buffer was full before this request or we are checking the parent circuit breaker
next.addEstimateBytesAndMaybeBreak(bytes, label);
return;
}
Expand Down