From 6ffda5cbd317611f7243d0a7176e1f91b700d456 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Thu, 8 Feb 2024 09:00:08 +0200
Subject: [PATCH] Fix simpletest logic

- LAC is updated asynchronously. Entries might be unconfirmed when read before ledger is closed.
- The last entry id passed to the read method was invalid
---
 .../commands/client/SimpleTestCommand.java    | 71 +++++++++++++------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java
index ca94cac4a73..7b43006a19e 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/cli/commands/client/SimpleTestCommand.java
@@ -88,17 +88,18 @@ protected void run(BookKeeper bk, Flags flags) throws Exception {
         for (int i = 0; i < data.length; i++) {
             data[i] = (byte) (random.nextInt(26) + 65);
         }
-        WriteHandle wh = null;
-        try {
-            wh = result(bk.newCreateLedgerOp()
-                    .withEnsembleSize(flags.ensembleSize)
-                    .withWriteQuorumSize(flags.writeQuorumSize)
-                    .withAckQuorumSize(flags.ackQuorumSize)
-                    .withDigestType(DigestType.CRC32C)
-                    .withCustomMetadata(ImmutableMap.of("Bookie", NAME.getBytes(StandardCharsets.UTF_8)))
-                    .withPassword(new byte[0])
-                    .execute());
-            LOG.info("Ledger ID: {}", wh.getId());
+        long ledgerId = -1L;
+        long lastEntryId = -1L;
+        try (WriteHandle wh = result(bk.newCreateLedgerOp()
+                .withEnsembleSize(flags.ensembleSize)
+                .withWriteQuorumSize(flags.writeQuorumSize)
+                .withAckQuorumSize(flags.ackQuorumSize)
+                .withDigestType(DigestType.CRC32C)
+                .withCustomMetadata(ImmutableMap.of("Bookie", NAME.getBytes(StandardCharsets.UTF_8)))
+                .withPassword(new byte[0])
+                .execute())) {
+            ledgerId = wh.getId();
+            LOG.info("Ledger ID: {}", ledgerId);
             long lastReport = System.nanoTime();
             for (int i = 0; i < flags.numEntries; i++) {
                 wh.append(data);
@@ -108,22 +109,50 @@ protected void run(BookKeeper bk, Flags flags) throws Exception {
                     lastReport = System.nanoTime();
                 }
             }
-            LOG.info("{} entries written to ledger {}", flags.numEntries, wh.getId());
+            lastEntryId = wh.getLastAddPushed();
+            LOG.info("{} entries written to ledger {}. Last entry Id {}", flags.numEntries, ledgerId, lastEntryId);
+            if (lastEntryId != flags.numEntries - 1) {
+                throw new IllegalStateException("Last entry id doesn't match the expected value");
+            }
+            // check that all entries are readable
+            readEntries(bk, ledgerId, lastEntryId, flags.numEntries, true, data);
+        }
+        if (ledgerId != -1) {
+            try {
+                if (lastEntryId != -1) {
+                    // check that all entries are readable and confirmed
+                    readEntries(bk, ledgerId, lastEntryId, flags.numEntries, false, data);
+                } else {
+                    throw new IllegalStateException("Last entry id is not set");
+                }
+            } finally {
+                // delete the ledger
+                result(bk.newDeleteLedgerOp().withLedgerId(ledgerId).execute());
+            }
+        } else {
+            throw new IllegalStateException("Ledger id is not set");
+        }
+    }
 
-            try (ReadHandle rh = result(bk.newOpenLedgerOp().withLedgerId(wh.getId()).withDigestType(DigestType.CRC32C)
-                    .withPassword(new byte[0]).execute())) {
-                LedgerEntries ledgerEntries = rh.read(0, flags.numEntries);
+    private static void readEntries(BookKeeper bk, long ledgerId, long lastEntryId, int expectedNumberOfEntries,
+                                    boolean readUnconfirmed, byte[] data) throws Exception {
+        int entriesRead = 0;
+        try (ReadHandle rh = result(bk.newOpenLedgerOp().withLedgerId(ledgerId).withDigestType(DigestType.CRC32C)
+                .withPassword(new byte[0]).execute())) {
+            try (LedgerEntries ledgerEntries = readUnconfirmed ? rh.readUnconfirmed(0, lastEntryId) :
+                    rh.read(0, lastEntryId)) {
                 for (LedgerEntry ledgerEntry : ledgerEntries) {
                     if (!Arrays.equals(ledgerEntry.getEntryBytes(), data)) {
-                        LOG.error("Read test failed, the reading data is not equals writing data.");
+                        throw new IllegalStateException("Read data doesn't match the data written.");
                     }
+                    entriesRead++;
                 }
             }
-        } finally {
-            if (wh != null) {
-                wh.close();
-                result(bk.newDeleteLedgerOp().withLedgerId(wh.getId()).execute());
-            }
+        }
+        if (entriesRead != expectedNumberOfEntries) {
+            throw new IllegalStateException(
+                    String.format("Number of entries read (%d) doesn't match the expected value (%d).",
+                            entriesRead, expectedNumberOfEntries));
         }
     }
 }