(bookkeeper) branch master updated: #4574: fix sanity check asyncBatchReadEntries (#4579)

[lushiji]

This is an automated email from the ASF dual-hosted git repository.

lushiji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 3fea440a94 #4574: fix sanity check asyncBatchReadEntries  (#4579)
3fea440a94 is described below

commit 3fea440a94d502420caa2114a26eafef64cab3eb
Author: mazzucchi-andrea <33907342+mazzucchi-and...@users.noreply.github.com>
AuthorDate: Tue Apr 15 13:10:54 2025 +0200

    #4574: fix sanity check asyncBatchReadEntries  (#4579)
    
    * fix sanity check batchReadEntries
---
 .../org/apache/bookkeeper/client/LedgerHandle.java |  6 ++--
 .../apache/bookkeeper/client/BookKeeperTest.java   | 38 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
index bf71e75282..2f2526e8f2 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
@@ -754,10 +754,10 @@ public class LedgerHandle implements WriteHandle {
      */
     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()) {
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
index bb534b1e58..93ace7eacb 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
@@ -715,6 +715,44 @@ public class BookKeeperTest extends 
BookKeeperClusterTestCase {
         }
     }
 
+    @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);