Fix an issue wheras a -1 breaker limit was interpreted wrongly
#13096
Conversation
This file contains 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
server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java
Outdated
Show resolved
Hide resolved
BaurzhanSakhariev
approved these changes
Oct 4, 2022
mfussenegger
approved these changes
Oct 4, 2022
Comment on lines
+71
to
+77
| if (memoryBytesLimit == -1) { | ||
| freeSupplier = () -> Long.MAX_VALUE; | ||
| } else if (memoryBytesLimit == 0) { | ||
| freeSupplier = () -> 0L; | ||
| } else { | ||
| freeSupplier = () -> getLimit() - getUsed(); | ||
| } |
There was a problem hiding this comment.
Could it also be set to other negative values, or is that forbidden already?
There was a problem hiding this comment.
This is forbidden already, see https://github.com/crate/crate/blob/master/server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java#L43
A `-1` limit on a breaker should not result in breaking but just accounting. This was not taken into account at the breakers `getFree()` method. It will return Long.MAX_VALUE in this case now. Additionally if will return `0` if the limit is set to `0` which indicates that the breaker should refuce any data according to the related breaker implementation. See also ChildMemoryCircuitBreaker.addEstimateBytesAndMaybeBreak().
seut
force-pushed
the
s/fix-breaker-get-free
branch
from
cf500f1
to
405f2fd
Compare
seut
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the changes / Why this improves CrateDB
A
-1limit on a breaker should not result in breaking but just accounting. This was not taken into account at the breakersgetFree()method. It will return Long.MAX_VALUE in this case now.Additionally if will return
0if the limit is set to0which indicates that the breaker should refuce any data according to the related breaker implementation.See also
ChildMemoryCircuitBreaker.addEstimateBytesAndMaybeBreak().Checklist
CHANGES.txtfor user facing changessql_featurestable for user facing changesCHANGES.txt(E.g. AdminUI)