Skip to content

Fix the data loss issue that caused by the wrong entry log header #4607

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
zymap merged 2 commits into from
May 30, 2025
+47 −1
Merged

Fix the data loss issue that caused by the wrong entry log header #4607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06bd95f
Fix the data loss issue that caused by the wrong entry log header
zymap May 29, 2025
faeb436
Add test
zymap May 29, 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
4 changes: 4 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 @@ -1151,6 +1151,10 @@ EntryLogMetadata extractEntryLogMetadataFromIndex(long entryLogId) throws IOExce
+ " -- found: " + meta.getLedgersMap().size() + " -- entryLogId: " + entryLogId);
}

if (header.ledgersCount == 0) {
throw new IOException("No ledgers map found in entryLogId " + entryLogId + ", do scan to double confirm");
}

return meta;
}

Expand Down
1 change: 1 addition & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class EntryLoggerAllocator {
// within the same JVM. All of these Bookie instances access this header
// so there can be race conditions when entry logs are rolled over and
// this header buffer is cleared before writing it into the new logChannel.
logfileHeader.setZero(0, DefaultEntryLogger.LOGFILE_HEADER_SIZE);
logfileHeader.writeBytes("BKLO".getBytes(UTF_8));
logfileHeader.writeInt(DefaultEntryLogger.HEADER_CURRENT_VERSION);
logfileHeader.writerIndex(DefaultEntryLogger.LOGFILE_HEADER_SIZE);
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -842,11 +842,12 @@ protected void extractMetaFromEntryLogs() throws EntryLogMetadataMapException {
continue;
}

LOG.info("Extracting entry log meta from entryLogId: {}", entryLogId);

try {
// Read through the entry log file and extract the entry log meta
EntryLogMetadata entryLogMeta = entryLogger.getEntryLogMetadata(entryLogId, throttler);
LOG.info("Extracted entry log meta from entryLogId: {}, ledgers {}",
entryLogId, entryLogMeta.getLedgersMap().keys());
removeIfLedgerNotExists(entryLogMeta);
if (entryLogMeta.isEmpty()) {
// This means the entry log is not associated with any active
Expand Down
Loading