stage 10: bugfix indexDirs for ConvertToInterleavedStorageCommand (#3409

) Co-authored-by: lushiji <[email protected]>
apache · Jul 19, 2022 · c687524 · c687524
1 parent fcb7149
commit c687524
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...a/org/apache/bookkeeper/tools/cli/commands/bookie/ConvertToInterleavedStorageCommand.java b/...a/org/apache/bookkeeper/tools/cli/commands/bookie/ConvertToInterleavedStorageCommand.java
@@ -26,6 +26,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.apache.bookkeeper.bookie.Bookie;
+import org.apache.bookkeeper.bookie.BookieResources;
 import org.apache.bookkeeper.bookie.CheckpointSource;
 import org.apache.bookkeeper.bookie.Checkpointer;
 import org.apache.bookkeeper.bookie.InterleavedLedgerStorage;
@@ -88,10 +89,10 @@ public boolean apply(ServerConfiguration conf, CTISFlags cmdFlags) {
     private boolean handle(ServerConfiguration bkConf) throws Exception {
         LOG.info("=== Converting DbLedgerStorage ===");
         ServerConfiguration conf = new ServerConfiguration(bkConf);
-        LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(bkConf, bkConf.getLedgerDirs(),
-            new DiskChecker(bkConf.getDiskUsageThreshold(), bkConf.getDiskUsageWarnThreshold()));
-        LedgerDirsManager ledgerIndexManager = new LedgerDirsManager(bkConf, bkConf.getLedgerDirs(),
-            new DiskChecker(bkConf.getDiskUsageThreshold(), bkConf.getDiskUsageWarnThreshold()));
+        DiskChecker diskChecker = new DiskChecker(bkConf.getDiskUsageThreshold(), bkConf.getDiskUsageWarnThreshold());
+        LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(bkConf, bkConf.getLedgerDirs(), diskChecker);
+        LedgerDirsManager indexDirsManager = BookieResources.createIndexDirsManager(
+                conf, diskChecker, NullStatsLogger.INSTANCE, ledgerDirsManager);
 
         DbLedgerStorage dbStorage = new DbLedgerStorage();
         InterleavedLedgerStorage interleavedStorage = new InterleavedLedgerStorage();
@@ -117,11 +118,11 @@ public void start() {
             }
         };
 
-        dbStorage.initialize(conf, null, ledgerDirsManager, ledgerIndexManager,
+        dbStorage.initialize(conf, null, ledgerDirsManager, indexDirsManager,
                              NullStatsLogger.INSTANCE, PooledByteBufAllocator.DEFAULT);
         dbStorage.setCheckpointSource(checkpointSource);
         dbStorage.setCheckpointer(checkpointer);
-        interleavedStorage.initialize(conf, null, ledgerDirsManager, ledgerIndexManager,
+        interleavedStorage.initialize(conf, null, ledgerDirsManager, indexDirsManager,
                                       NullStatsLogger.INSTANCE, PooledByteBufAllocator.DEFAULT);
         interleavedStorage.setCheckpointSource(checkpointSource);
         interleavedStorage.setCheckpointer(checkpointer);

diff --git a/...g/apache/bookkeeper/tools/cli/commands/bookie/ConvertToInterleavedStorageCommandTest.java b/...g/apache/bookkeeper/tools/cli/commands/bookie/ConvertToInterleavedStorageCommandTest.java
@@ -56,8 +56,9 @@ public class ConvertToInterleavedStorageCommandTest extends BookieCommandTestBas
     private LedgerCache interleavedLedgerCache;
 
 
+    // create multi ledger dirs and multi index dirs
     public ConvertToInterleavedStorageCommandTest() {
-        super(3, 0);
+        super(3, 3);
     }
 
     @Override