-
Notifications
You must be signed in to change notification settings - Fork 907
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.
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
Release readBuffer when close BufferedReadChannel
& BufferedChannel
#4030
Open
lifepuzzlefun
wants to merge
5
commits into
apache:master
Choose a base branch
from
lifepuzzlefun:fix_read_buffer_leak
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
22981f0
fix readBuffer leak
lifepuzzlefun cdd49f5
fix readBuffer leak
lifepuzzlefun 50cffc1
remove clear writeBuffer
lifepuzzlefun1 87c9e3f
use ReferenceCountUtil to release
lifepuzzlefun c49931f
Merge remote-tracking branch 'wjl/fix_read_buffer_leak' into fix_read…
lifepuzzlefun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
|
||
import io.netty.buffer.ByteBuf; | ||
import io.netty.buffer.Unpooled; | ||
import io.netty.util.ReferenceCountUtil; | ||
import java.io.IOException; | ||
import java.nio.channels.FileChannel; | ||
|
||
|
@@ -44,6 +45,8 @@ public class BufferedReadChannel extends BufferedChannelBase { | |
long invocationCount = 0; | ||
long cacheHitCount = 0; | ||
|
||
private boolean closed = false; | ||
|
||
public BufferedReadChannel(FileChannel fileChannel, int readCapacity) { | ||
super(fileChannel); | ||
this.readCapacity = readCapacity; | ||
|
@@ -103,4 +106,17 @@ public synchronized void clear() { | |
readBuffer.clear(); | ||
} | ||
|
||
public synchronized void close() throws IOException { | ||
if (closed) { | ||
return; | ||
} | ||
|
||
readBufferStartPosition = Long.MIN_VALUE; | ||
ReferenceCountUtil.release(readBuffer); | ||
|
||
// BufferedReadChannel is not response for fileChannel close. | ||
|
||
closed = true; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move the closed to the first step? |
||
} | ||
|
||
} |
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
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -899,6 +899,7 @@ private BufferedReadChannel getChannelForLogId(long entryLogId) throws IOExcepti | |||
// We set the position of the write buffer of this buffered channel to Long.MAX_VALUE | ||||
// so that there are no overlaps with the write buffer while reading | ||||
fc = new BufferedReadChannel(newFc, conf.getReadBufferBytes()); | ||||
|
||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
putInReadChannels(entryLogId, fc); | ||||
return fc; | ||||
} | ||||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we close and reset the position after setting the closed to true?