Skip to content

Fix headerBuffer leak in DefaultEntryLogger.scanEntryLog #4023

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

Open
lifepuzzlefun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix headerBuffer leak in DefaultEntryLogger.scanEntryLog #4023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
264cec4
fix headerBuffer not release.
lifepuzzlefun1 Jul 8, 2023
51ec614
address comment
lifepuzzlefun1 Jul 25, 2023
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
7 changes: 7 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/DefaultEntryLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,12 +968,18 @@ public void scanEntryLog(long entryLogId, EntryLogScanner scanner) throws IOExce
// Buffer where to read the entrySize (4 bytes) and the ledgerId (8 bytes)
ByteBuf headerBuffer = Unpooled.buffer(4 + 8);
BufferedReadChannel bc;
boolean throwExceptionWhenGetChannel = false;
// Get the BufferedChannel for the current entry log file
try {
bc = getChannelForLogId(entryLogId);
} catch (IOException e) {
LOG.warn("Failed to get channel to scan entry log: " + entryLogId + ".log");
throwExceptionWhenGetChannel = true;
Copy link
Contributor

@AnonHxy AnonHxy Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not call headerBuffer.release() here?

And I think that it will be better if we move line969 to just before the second try catch block, like:

ByteBuf data = allocator.directBuffer(1024 * 1024);
ByteBuf headerBuffer = Unpooled.buffer(4 + 8);  // line969
 try {
           
            // Read through the entry log file and extract the ledger ID's.
            while (true) {
                // Check if we'`
            // ...
           // ...
 finally {
           ReferenceCountUtil.release(headerBuffer);
            ReferenceCountUtil.release(data);
   }

Copy link
Contributor Author

@lifepuzzlefun lifepuzzlefun Aug 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review. I think the code function is the same. release resource in finally code block is more like the java style.

Copy link
Member

@horizonzy horizonzy Aug 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree with @AnonHxy

throw e;
} finally {
if (throwExceptionWhenGetChannel) {
headerBuffer.release();
}
}
// Start the read position in the current entry log file to be after
// the header where all of the ledger entries are.
Expand Down Expand Up @@ -1027,6 +1033,7 @@ public void scanEntryLog(long entryLogId, EntryLogScanner scanner) throws IOExce
pos += entrySize;
}
} finally {
ReferenceCountUtil.release(headerBuffer);
ReferenceCountUtil.release(data);
}
}
Expand Down