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

Jump to bottom

Fix PreallocatedCircuitBreakerService leak #72846

Merged
merged 1 commit into from
May 10, 2021
Merged

Fix PreallocatedCircuitBreakerService leak #72846

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
17 changes: 9 additions & 8 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 @@ -21,7 +21,7 @@
*/
public class PreallocatedCircuitBreakerService extends CircuitBreakerService implements Releasable {
private final CircuitBreakerService next;
private final PreallocedCircuitBreaker preallocated;
private final PreallocatedCircuitBreaker preallocated;

public PreallocatedCircuitBreakerService(
CircuitBreakerService next,
Expand All @@ -35,7 +35,7 @@ public PreallocatedCircuitBreakerService(
CircuitBreaker nextBreaker = next.getBreaker(breakerToPreallocate);
nextBreaker.addEstimateBytesAndMaybeBreak(bytesToPreallocate, "preallocate[" + label + "]");
this.next = next;
this.preallocated = new PreallocedCircuitBreaker(nextBreaker, bytesToPreallocate);
this.preallocated = new PreallocatedCircuitBreaker(nextBreaker, bytesToPreallocate);
}

@Override
Expand Down Expand Up @@ -72,8 +72,8 @@ public void close() {
* <p>
* If we're in the "used fewer bytes" state than we've allocated then
* allocating new bytes just adds to
* {@link PreallocedCircuitBreaker#preallocationUsed}, maxing out at
* {@link PreallocedCircuitBreaker#preallocated}. If we max
* {@link PreallocatedCircuitBreaker#preallocationUsed}, maxing out at
* {@link PreallocatedCircuitBreaker#preallocated}. If we max
* out we irreversibly switch to "used all" state. In that state any
* additional allocations are passed directly to the underlying breaker.
* <p>
Expand All @@ -83,17 +83,17 @@ public void close() {
* "used all" state all de-allocates are done directly on the underlying
* breaker. So well behaved callers will naturally de-allocate everything.
* <p>
* {@link PreallocedCircuitBreaker#close()} is only used to de-allocate
* {@link PreallocatedCircuitBreaker#close()} is only used to de-allocate
* bytes from the underlying breaker if we're still in the "used fewer bytes"
* state. There is nothing to de-allocate if we are in the "used all" state.
*/
private static class PreallocedCircuitBreaker implements CircuitBreaker, Releasable {
private static class PreallocatedCircuitBreaker implements CircuitBreaker, Releasable {
private final CircuitBreaker next;
private final long preallocated;
private long preallocationUsed;
private boolean closed;

PreallocedCircuitBreaker(CircuitBreaker next, long preallocated) {
PreallocatedCircuitBreaker(CircuitBreaker next, long preallocated) {
this.next = next;
this.preallocated = preallocated;
}
Expand All @@ -116,8 +116,9 @@ public void addEstimateBytesAndMaybeBreak(long bytes, String label) throws Circu
long newUsed = preallocationUsed + bytes;
if (newUsed > preallocated) {
// This request filled up the buffer
preallocationUsed = preallocated;
next.addEstimateBytesAndMaybeBreak(newUsed - preallocated, label);
// Adjust preallocationUsed only after we know we didn't circuit break!
preallocationUsed = preallocated;
return;
}
// This is the fast case. No volatile reads or writes here, ma!
Expand Down