Skip to content

fix(issues1302): fix StreamReader buf LEAK #1311

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

Merged
merged 1 commit into from
May 27, 2024
Merged

fix(issues1302): fix StreamReader buf LEAK #1311

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
15 changes: 6 additions & 9 deletions s3stream/src/main/java/com/automq/stream/s3/cache/blockcache/StreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,25 +303,22 @@ private void getBlocks0(GetBlocksContext ctx, long startOffset, long endOffset,
int finalRemainingSize = remainingSize;
// use async to prevent recursive call cause stack overflow
loadMoreBlocksCf.thenAcceptAsync(moreBlocks -> {
boolean readMore = false;
if (ctx.readahead) {
// If #loadMoreBlocksWithoutData result is empty, it means the stream is already loads to the end.
if (moreBlocks) {
readMore = true;
if (!moreBlocks) {
ctx.cf.complete(ctx.blocks);
return;
}
} else {
if (!moreBlocks && endOffset > loadedBlockIndexEndOffset) {
String errMsg = String.format("[BUG] streamId=%s expect load blocks to endOffset=%s, " +
"current loadedBlockIndexEndOffset=%s", streamId, endOffset, loadedBlockIndexEndOffset);
ctx.cf.completeExceptionally(new AutoMQException(errMsg));
} else {
readMore = true;
return;
}
}
if (readMore) {
long nextStartOffset = ctx.blocks.isEmpty() ? startOffset : ctx.blocks.get(ctx.blocks.size() - 1).index.endOffset();
getBlocks0(ctx, nextStartOffset, endOffset, finalRemainingSize);
}
long nextStartOffset = ctx.blocks.isEmpty() ? startOffset : ctx.blocks.get(ctx.blocks.size() - 1).index.endOffset();
getBlocks0(ctx, nextStartOffset, endOffset, finalRemainingSize);
}, eventLoop).exceptionally(ex -> {
ctx.cf.completeExceptionally(ex);
return null;
Expand Down