[CASSANDRA-20753][4.0] Fix BufferPool leak in BufferPoolAllocator when a capacity needs to be extended #4262
Conversation
This file contains hidden or 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
…tended Before the fix during a capacity extension BufferPoolAllocator returned to BufferPool a sliced ByteBuffer wrapper object instead of the originally allocated one, so the ByteBuffer was not recycled by BufferPool Adjust BufferPoolAllocatorTest to test the ByteBuf capacity extension with a real BufferPool behavior Patch by Dmitry Konstantinov; reviewed by TBD for CASSANDRA-20753
Comment on lines
+1629
to
+1635
| return originalBuffer; | ||
| if (Chunk.getParentChunk(buffer) != null) | ||
| return buffer; | ||
|
|
||
| Object attachment = MemoryUtil.getAttachment(buffer); | ||
| if (!(attachment instanceof ByteBuffer)) | ||
| return originalBuffer; |
There was a problem hiding this comment.
in the two places where we fallback to return originalBuffer; is there any difference if originalBuffer or the previous buffer value (not the current value of buffer) was returned ?
There was a problem hiding this comment.
I relied on a common sense logic here: if we get something non-expected as an input - do not modify it and return the original value (it is also a fallback to the original behaviour), it is just a safer approach by default, IMHO
|
on the 5.0 patch can we run the multiplexer on the test please. |
|
the repeated run is passed using 5.0 branch (https://github.com/netudima/cassandra/tree/CASSANDRA-20753-5.0): used command: |
michaelsembwever
approved these changes
Aug 18, 2025
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.
Before the fix during a capacity extension BufferPoolAllocator returned to BufferPool a sliced ByteBuffer wrapper object instead of the originally allocated one, so the ByteBuffer was not recycled by BufferPool
Adjust BufferPoolAllocatorTest to test the ByteBuf capacity extension with a real BufferPool behaviuor
Patch by Dmitry Konstantinov; reviewed by TBD for CASSANDRA-20753