Skip to content

Optimize ListActiveLedgersCommand #4602

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
StevenLuMT merged 4 commits into from
May 16, 2025
Merged

Optimize ListActiveLedgersCommand #4602

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d614cf3
Optimize ListActiveLedgersCommand
AnonHxy May 12, 2025
8bd8382
check style
AnonHxy May 12, 2025
ff42588
UT
AnonHxy May 15, 2025
7e108fc
check style
AnonHxy May 15, 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
34 changes: 15 additions & 19 deletions ...c/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ListActiveLedgersCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
import com.google.common.util.concurrent.UncheckedExecutionException;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -135,17 +133,13 @@ public void handler(ServerConfiguration bkConf, ActiveLedgerFlags cmdFlags)
if (resultCode.get() == BKException.Code.OK) {
DefaultEntryLogger entryLogger = new ReadOnlyDefaultEntryLogger(bkConf);
EntryLogMetadata entryLogMetadata = entryLogger.getEntryLogMetadata(cmdFlags.logId);
List<Long> ledgersOnEntryLog = entryLogMetadata.getLedgersMap().keys();
if (ledgersOnEntryLog.size() == 0) {
Map<Long, Long> ledgersOnEntryLog = entryLogMetadata.getLedgersMap().asMap();
if (ledgersOnEntryLog.isEmpty()) {
LOG.info("Ledgers on log file {} is empty", cmdFlags.logId);
}
List<Long> activeLedgersOnEntryLog = new ArrayList<Long>(ledgersOnEntryLog.size());
for (long ledger : ledgersOnEntryLog) {
if (activeLedgersOnMetadata.contains(ledger)) {
activeLedgersOnEntryLog.add(ledger);
}
}
printActiveLedgerOnEntryLog(cmdFlags.logId, activeLedgersOnEntryLog);

entryLogMetadata.removeLedgerIf(ledgerId -> !activeLedgersOnMetadata.contains(ledgerId));
printActiveLedgerOnEntryLog(cmdFlags.logId, entryLogMetadata);
} else {
LOG.info("Read active ledgers id from metadata store,fail code {}", resultCode.get());
throw BKException.create(resultCode.get());
Expand All @@ -161,15 +155,17 @@ public void handler(ServerConfiguration bkConf, ActiveLedgerFlags cmdFlags)
});
}

public void printActiveLedgerOnEntryLog(long logId, List<Long> activeLedgers){
if (activeLedgers.size() == 0){
public void printActiveLedgerOnEntryLog(long logId, EntryLogMetadata entryLogMetadata) {
LOG.info("Print active ledgers of entrylog {} ({}.log)", logId, Long.toHexString(logId));
if (entryLogMetadata.getRemainingSize() == 0){
LOG.info("No active ledgers on log file {}", logId);
} else {
LOG.info("Active ledgers on entry log {} as follow:", logId);
}
Collections.sort(activeLedgers);
for (long a : activeLedgers){
LOG.info("{} ", ledgerIdFormatter.formatLedgerId(a));
LOG.info("entryLogId: {}, remaining size: {}, total size: {}, usage: {}", entryLogMetadata.getEntryLogId(),
entryLogMetadata.getRemainingSize(), entryLogMetadata.getTotalSize(), entryLogMetadata.getUsage());
}
entryLogMetadata.getLedgersMap().forEach((ledgerId, size) -> {
LOG.info("--------- Lid={}, TotalSizeOfEntriesOfLedger={} ---------",
ledgerIdFormatter.formatLedgerId(ledgerId), size);
});
}
}
3 changes: 1 addition & 2 deletions ...src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLogMetadataCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ private void printEntryLogMetadata(ServerConfiguration conf, long logId) throws
LOG.info("Print entryLogMetadata of entrylog {} ({}.log)", logId, Long.toHexString(logId));
initEntryLogger(conf);
EntryLogMetadata entryLogMetadata = entryLogger.getEntryLogMetadata(logId);
LOG.info("entryLogId: {}, remaining size: {}, total size: {}, usage: {}", entryLogMetadata.getEntryLogId(),
entryLogMetadata.getRemainingSize(), entryLogMetadata.getTotalSize(), entryLogMetadata.getUsage());
LOG.info("entryLogId: {}, total size: {}", entryLogMetadata.getEntryLogId(), entryLogMetadata.getTotalSize());

entryLogMetadata.getLedgersMap().forEach((ledgerId, size) -> {
LOG.info("--------- Lid={}, TotalSizeOfEntriesOfLedger={} ---------",
Expand Down