Skip to content

[improve] Update readledger command to read all the entries from a bookie when first entry and last entry ids are not provided #4692

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
vraulji567 wants to merge 2 commits into
base: branch-4.17
Choose a base branch
from
+23 −2
Open

[improve] Update readledger command to read all the entries from a bookie when first entry and last entry ids are not provided #4692

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
56ead85
Update readledger command to read all the entries from a bookie when …
vraulji567 Dec 3, 2025
c07bce0
Fix Test in ReadLedgerCommandTest
vraulji567 Dec 24, 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
8 changes: 7 additions & 1 deletion ...rver/src/main/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLedgerCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,13 @@ private boolean readledger(ServerConfiguration serverConf, ReadLedgerFlags flags
executor, scheduler, NullStatsLogger.INSTANCE,
bk.getBookieAddressResolver());

LongStream.range(flags.firstEntryId, lastEntry).forEach(entryId -> {
// Determine the last ledger entry from ledger metadata if its is not provided
if (flags.lastEntryId == -1 && !flags.forceRecovery) {
LedgerHandle lh = bk.openLedgerNoRecovery(flags.ledgerId);
lastEntry = lh.getLastAddConfirmed();
}

LongStream.rangeClosed(flags.firstEntryId, lastEntry).forEach(entryId -> {
CompletableFuture<Void> future = new CompletableFuture<>();

bookieClient.readEntry(bookie, flags.ledgerId, entryId,
Expand Down
17 changes: 16 additions & 1 deletion .../src/test/java/org/apache/bookkeeper/tools/cli/commands/bookie/ReadLedgerCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand All @@ -35,13 +36,15 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Consumer;
import lombok.SneakyThrows;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.BookKeeperAdmin;
import org.apache.bookkeeper.client.LedgerEntry;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.common.util.OrderedExecutor;
import org.apache.bookkeeper.net.BookieId;
import org.apache.bookkeeper.net.BookieSocketAddress;
import org.apache.bookkeeper.proto.BookieClientImpl;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.ReadEntryCallback;
import org.apache.bookkeeper.tools.cli.helpers.BookieCommandTestBase;
import org.junit.Assert;
import org.junit.Test;
Expand Down Expand Up @@ -89,6 +92,7 @@ public void accept(BookKeeperAdmin bookKeeperAdmin) {
when(bookKeeperAdmin.getBookieAddressResolver())
.thenReturn(BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
when(bookKeeperAdmin.openLedger(anyLong())).thenReturn(ledgerHandle);
when(bookKeeperAdmin.openLedgerNoRecovery(anyLong())).thenReturn(ledgerHandle);
when(bookKeeperAdmin.readEntries(anyLong(), anyLong(), anyLong())).thenReturn(entries);
}
});
Expand All @@ -110,7 +114,18 @@ public void accept(BookKeeperAdmin bookKeeperAdmin) {
.newSingleThreadScheduledExecutor(any(DefaultThreadFactory.class)))
.thenReturn(scheduledExecutorService);

mockConstruction(BookieClientImpl.class);
mockConstruction(BookieClientImpl.class, (mock, contest) -> {
doAnswer(invocation -> {
ReadEntryCallback callback = invocation.getArgument(3);
callback.readEntryComplete(BKException.Code.OK,
invocation.getArgument(1), // ledgerId
invocation.getArgument(2), // entryId
null, // buffer
invocation.getArgument(4)); // ctx
return null;
}).when(mock).readEntry(any(), anyLong(), anyLong(), any(), any(), anyInt());

});


}
Expand Down