[ISSUE openmessaging#125] fix hanged unavailable file in deleteExpire…

…dFileByTime * [ISSUE openmessaging#122] fix high CPU in EntryDispatcher * fix hanged unavailable file
fb513 · Apr 11, 2022 · 49c3322 · 49c3322
1 parent 84d6b5d
commit 49c3322
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/io/openmessaging/storage/dledger/store/file/DLedgerMmapFileStore.java b/src/main/java/io/openmessaging/storage/dledger/store/file/DLedgerMmapFileStore.java
@@ -696,8 +696,9 @@ public CleanSpaceService(String name, Logger logger) {
                 boolean checkExpired = isNeedCheckExpired();
                 boolean forceClean = isNeedForceClean();
                 boolean enableForceClean = dLedgerConfig.isEnableDiskForceClean();
+                int intervalForcibly = 120 * 1000;
                 if (timeUp || checkExpired) {
-                    int count = getDataFileList().deleteExpiredFileByTime(fileReservedTimeMs, 100, 120 * 1000, forceClean && enableForceClean);
+                    int count = getDataFileList().deleteExpiredFileByTime(fileReservedTimeMs, 100, intervalForcibly, forceClean && enableForceClean);
                     if (count > 0 || (forceClean && enableForceClean) || isDiskFull) {
                         logger.info("Clean space count={} timeUp={} checkExpired={} forceClean={} enableForceClean={} diskFull={} storeBaseRatio={} dataRatio={}",
                             count, timeUp, checkExpired, forceClean, enableForceClean, isDiskFull, storeBaseRatio, dataRatio);
@@ -706,6 +707,7 @@ public CleanSpaceService(String name, Logger logger) {
                         DLedgerMmapFileStore.this.reviseLedgerBeginIndex();
                     }
                 }
+                getDataFileList().retryDeleteFirstFile(intervalForcibly);
                 waitForRunning(100);
             } catch (Throwable t) {
                 logger.info("Error in {}", getName(), t);