Skip to content

refactor: Eliminate redundant cleanup logic in entry log extraction #4599

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

Draft
nodece wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

refactor: Eliminate redundant cleanup logic in entry log extraction #4599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7f5091
refactor: Eliminate redundant cleanup logic in entry log extraction
nodece Apr 29, 2025
b9304a4
Fix test
nodece Apr 30, 2025
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
17 changes: 2 additions & 15 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ private void doGcLedgers() {
/**
* Garbage collect those entry loggers which are not associated with any active ledgers.
*/
private void doGcEntryLogs() throws EntryLogMetadataMapException {
protected void doGcEntryLogs() throws EntryLogMetadataMapException {
Copy link
Contributor

@AnonHxy AnonHxy May 16, 2025

Choose a reason for hiding this comment

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

protectd could be removed. Default access modifiers is enough.

// Get a cumulative count, don't update until complete
AtomicLong activeEntryLogSizeAcc = new AtomicLong(0L);
AtomicLong totalEntryLogSizeAcc = new AtomicLong(0L);
Expand Down Expand Up @@ -847,20 +847,7 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException {
try {
// Read through the entry log file and extract the entry log meta
EntryLogMetadata entryLogMeta = entryLogger.getEntryLogMetadata(entryLogId, throttler);
removeIfLedgerNotExists(entryLogMeta);
if (entryLogMeta.isEmpty()) {
// This means the entry log is not associated with any active
// ledgers anymore.
// We can remove this entry log file now.
LOG.info("Deleting entryLogId {} as it has no active ledgers!", entryLogId);
if (removeEntryLog(entryLogId)) {
gcStats.getReclaimedSpaceViaDeletes().addCount(entryLogMeta.getTotalSize());
} else {
gcStats.getReclaimFailedToDelete().inc();
}
} else {
entryLogMetaMap.put(entryLogId, entryLogMeta);
}
entryLogMetaMap.put(entryLogId, entryLogMeta);
} catch (IOException | RuntimeException e) {
LOG.warn("Premature exception when processing {} recovery will take care of the problem",
entryLogId, e);
Expand Down
4 changes: 4 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/GarbageCollectorThreadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ private void testExtractMetaFromEntryLogs(EntryLogger entryLogger, File ledgerDi
// all ledgers exist, nothing should disappear
final EntryLogMetadataMap entryLogMetaMap = gcThread.getEntryLogMetaMap();
gcThread.extractMetaFromEntryLogs();
gcThread.doGcEntryLogs();

assertThat(entryLogger.getFlushedLogIds(), containsInAnyOrder(logId1, logId2));
assertTrue(entryLogMetaMap.containsKey(logId1));
Expand All @@ -210,6 +211,7 @@ private void testExtractMetaFromEntryLogs(EntryLogger entryLogger, File ledgerDi
entryLogMetaMap.clear();
storage.deleteLedger(2L);
gcThread.extractMetaFromEntryLogs();
gcThread.doGcEntryLogs();

assertThat(entryLogger.getFlushedLogIds(), containsInAnyOrder(logId1));
assertTrue(entryLogMetaMap.containsKey(logId1));
Expand All @@ -220,6 +222,7 @@ private void testExtractMetaFromEntryLogs(EntryLogger entryLogger, File ledgerDi
storage.deleteLedger(1L);
storage.deleteLedger(3L);
gcThread.extractMetaFromEntryLogs();
gcThread.doGcEntryLogs();

assertThat(entryLogger.getFlushedLogIds(), empty());
assertTrue(entryLogMetaMap.isEmpty());
Expand All @@ -233,6 +236,7 @@ private void testExtractMetaFromEntryLogs(EntryLogger entryLogger, File ledgerDi

entryLogMetaMap.clear();
gcThread.extractMetaFromEntryLogs();
gcThread.doGcEntryLogs();

assertThat(entryLogger.getFlushedLogIds(), empty());
assertTrue(entryLogMetaMap.isEmpty());
Expand Down