Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ class ReadLedgerEntriesCmd extends MyCommand {
lOpts.addOption("l", "ledgerid", true, "Ledger ID");
lOpts.addOption("fe", "firstentryid", true, "First EntryID");
lOpts.addOption("le", "lastentryid", true, "Last EntryID");
lOpts.addOption("r", "force-recovery", false, "Ensure the ledger is properly closed before reading");
}

@Override
Expand All @@ -582,7 +583,8 @@ String getDescription() {
@Override
String getUsage() {
return "readledger [-msg] -ledgerid <ledgerid> "
+ "[-firstentryid <firstentryid> [-lastentryid <lastentryid>]]";
+ "[-firstentryid <firstentryid> [-lastentryid <lastentryid>]] "
+ "[-force-recovery]";
}

@Override
Expand All @@ -594,23 +596,33 @@ int runCmd(CommandLine cmdLine) throws Exception {
}

final long firstEntry = getOptionLongValue(cmdLine, "firstentryid", 0);
final long lastEntry = getOptionLongValue(cmdLine, "lastentryid", -1);
long lastEntry = getOptionLongValue(cmdLine, "lastentryid", -1);

boolean printMsg = cmdLine.hasOption("m");
boolean forceRecovery = cmdLine.hasOption("r");

ClientConfiguration conf = new ClientConfiguration();
conf.addConfiguration(bkConf);

BookKeeperAdmin bk = null;
try {
bk = new BookKeeperAdmin(conf);
if (forceRecovery) {
// Force the opening of the ledger to trigger recovery
try (LedgerHandle lh = bk.openLedger(ledgerId)) {
if (lastEntry == -1 || lastEntry > lh.getLastAddConfirmed()) {
lastEntry = lh.getLastAddConfirmed();
}
}
}

Iterator<LedgerEntry> entries = bk.readEntries(ledgerId, firstEntry, lastEntry).iterator();
while (entries.hasNext()) {
LedgerEntry entry = entries.next();
formatEntry(entry, printMsg);
}
} catch (Exception e) {
LOG.error("Error reading entries from ledger {}", ledgerId, e.getCause());
LOG.error("Error reading entries from ledger {}", ledgerId, e);
return -1;
} finally {
if (bk != null) {
Expand Down