Skip to content

#4574: fix sanity check asyncBatchReadEntries #4579

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 2 commits into from
Apr 15, 2025
Merged

#4574: fix sanity check asyncBatchReadEntries #4579

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
effe165
fix sanity check batchReadEntries
mazzucchi-andrea Apr 14, 2025
9e2dbeb
test sanity check batchReadEntries
mazzucchi-andrea Apr 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
6 changes: 3 additions & 3 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,10 +754,10 @@ public void asyncReadEntries(long firstEntry, long lastEntry, ReadCallback cb, O
*/
public void asyncBatchReadEntries(long startEntry, int maxCount, long maxSize, ReadCallback cb, Object ctx) {
// Little sanity check
if (startEntry > lastAddConfirmed) {
LOG.error("ReadEntries exception on ledgerId:{} firstEntry:{} lastAddConfirmed:{}",
if (startEntry < 0 || startEntry > lastAddConfirmed) {
LOG.error("IncorrectParameterException on ledgerId:{} startEntry:{} lastAddConfirmed:{}",
ledgerId, startEntry, lastAddConfirmed);
cb.readComplete(BKException.Code.ReadException, this, null, ctx);
cb.readComplete(BKException.Code.IncorrectParameterException, this, null, ctx);
return;
}
if (notSupportBatchRead()) {
Expand Down
38 changes: 38 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,44 @@ public void testBatchReadFailBackToSingleRead2() throws Exception {
}
}

@Test
public void testSanityCheckBatchReadEntriesV2() {
ClientConfiguration conf = new ClientConfiguration().setUseV2WireProtocol(true);
conf.setBatchReadEnabled(true);
conf.setMetadataServiceUri(zkUtil.getMetadataServiceUri());
int numEntries = 100;
byte[] data = "foobar".getBytes();
try (BookKeeper bkc = new BookKeeper(conf)) {
long ledgerId;
try (LedgerHandle lh = bkc.createLedger(2, 2, digestType, "testPasswd".getBytes())) {
ledgerId = lh.getId();
for (int i = 0; i < numEntries; i++) {
lh.addEntry(data);
}
} catch (BKException | InterruptedException e) {
fail("LedgerHandle inti failed: " + e.getMessage());
return;
}

// startEntry < 0
try (LedgerHandle lh = bkc.openLedger(ledgerId, digestType, "testPasswd".getBytes())) {
assertEquals(numEntries - 1, lh.readLastConfirmed());
Enumeration<LedgerEntry> entries = lh.batchReadEntries(-1, numEntries, 5 * 1024 * 1024);
} catch (BKException | InterruptedException e) {
LOG.info(e.getMessage(), e); // It should raise IncorrectParameterException
}

// startEntry > lastAddConfirmed
try (LedgerHandle lh = bkc.openLedger(ledgerId, digestType, "testPasswd".getBytes())) {
Enumeration<LedgerEntry> entries = lh.batchReadEntries(numEntries, numEntries, 5 * 1024 * 1024);
} catch (BKException | InterruptedException e) {
LOG.info(e.getMessage(), e); // It should raise IncorrectParameterException
}
} catch (BKException | InterruptedException | IOException e) {
fail("BookKeeper client init failed: " + e.getMessage());
}
}

@Test
public void testBatchReadWithV2Protocol() throws Exception {
ClientConfiguration conf = new ClientConfiguration().setUseV2WireProtocol(true);
Expand Down