(bookkeeper) branch branch-4.16 updated: fix pendingDeletedLedgers do not remove ledger error (#4525)

[lushiji]

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

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


The following commit(s) were added to refs/heads/branch-4.16 by this push:
     new 0d31202037 fix pendingDeletedLedgers do not remove ledger error (#4525)
0d31202037 is described below

commit 0d31202037b81b44fc1f290eef3319ac86b02740
Author: ken <1647023...@qq.com>
AuthorDate: Fri Feb 14 14:15:32 2025 +0800

    fix pendingDeletedLedgers do not remove ledger error (#4525)
    
    * fix pendingDeletedLedgers not remove ledger
    
    (cherry picked from commit 0df3caf530dacc41a48fa45f0ebfd8efedf81f95)
---
 .../bookie/storage/ldb/LedgerMetadataIndex.java    |  1 +
 .../bookie/storage/ldb/DbLedgerStorageTest.java    | 59 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java
index 9b50479b7d..edc816ce4b 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java
@@ -336,6 +336,7 @@ public class LedgerMetadataIndex implements Closeable {
                 key.set(ledgerId);
                 ledgersDb.delete(key.array);
                 ++deletedLedgers;
+                pendingDeletedLedgers.remove(ledgerId);
             }
 
             if (log.isDebugEnabled()) {
diff --git 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java
index 65f11e5d6a..dfc2459678 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageTest.java
@@ -33,8 +33,10 @@ import io.netty.util.ReferenceCountUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.List;
+import java.util.Set;
 import org.apache.bookkeeper.bookie.Bookie;
 import org.apache.bookkeeper.bookie.Bookie.NoEntryException;
 import org.apache.bookkeeper.bookie.BookieException;
@@ -52,6 +54,7 @@ import org.apache.bookkeeper.conf.ServerConfiguration;
 import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.proto.BookieProtocol;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -822,4 +825,60 @@ public class DbLedgerStorageTest {
         assertEquals(7, logMark.getLogFileId());
         assertEquals(8, logMark.getLogFileOffset());
     }
+
+    @Test
+    public void 
testSingleLedgerDirectoryCheckpointTriggerRemovePendingDeletedLedgers()
+            throws Exception {
+        int gcWaitTime = 1000;
+        File ledgerDir = new File(tmpDir, "dir");
+        ServerConfiguration conf = 
TestBKConfiguration.newServerConfiguration();
+        conf.setGcWaitTime(gcWaitTime);
+        conf.setProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB, 4);
+        conf.setProperty(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB, 4);
+        conf.setLedgerStorageClass(DbLedgerStorage.class.getName());
+        conf.setLedgerDirNames(new String[] { ledgerDir.getCanonicalPath() });
+
+        BookieImpl bookie = new TestBookieImpl(conf);
+        ByteBuf entry1 = Unpooled.buffer(1024);
+        entry1.writeLong(1); // ledger id
+        entry1.writeLong(2); // entry id
+        entry1.writeBytes("entry-1".getBytes());
+        bookie.getLedgerStorage().addEntry(entry1);
+
+        
bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(1, 2);
+        ((DbLedgerStorage) 
bookie.getLedgerStorage()).getLedgerStorageList().get(0).flush();
+
+        File ledgerDirMark = new File(ledgerDir + "/current", "lastMark");
+        try {
+            LogMark logMark = readLogMark(ledgerDirMark);
+            assertEquals(1, logMark.getLogFileId());
+            assertEquals(2, logMark.getLogFileOffset());
+        } catch (Exception e) {
+            fail();
+        }
+
+        ByteBuf entry2 = Unpooled.buffer(1024);
+        entry2.writeLong(2); // ledger id
+        entry2.writeLong(1); // entry id
+        entry2.writeBytes("entry-2".getBytes());
+
+        bookie.getLedgerStorage().addEntry(entry2);
+        // write one entry to first ledger directory and flush with logMark(1, 
2),
+        // only the first ledger directory should have lastMark
+        
bookie.getJournals().get(0).getLastLogMark().getCurMark().setLogMark(4, 5);
+
+        SingleDirectoryDbLedgerStorage storage1 =
+                ((DbLedgerStorage) 
bookie.getLedgerStorage()).getLedgerStorageList().get(0);
+        Field field = 
SingleDirectoryDbLedgerStorage.class.getDeclaredField("ledgerIndex");
+        field.setAccessible(true);
+        LedgerMetadataIndex ledgerMetadataIndex = (LedgerMetadataIndex) 
field.get(storage1);
+        Field field1 = 
LedgerMetadataIndex.class.getDeclaredField("pendingDeletedLedgers");
+        field1.setAccessible(true);
+        Set<Long> pendingDeletedLedgers = (Set<Long>) 
field1.get(ledgerMetadataIndex);
+
+        Assert.assertEquals(pendingDeletedLedgers.size(), 0);
+        pendingDeletedLedgers.add(2L);
+        bookie.getLedgerStorage().flush();
+        Assert.assertEquals(pendingDeletedLedgers.size(), 0);
+    }
 }