[ISSUE #5040] Optimize AutoSwitchHAService#truncateInvalidMsg logic (#…

…5041)
apache · Sep 13, 2022 · 2298d9b · 2298d9b
1 parent c820a68
commit 2298d9b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java b/store/src/main/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHAService.java
@@ -354,10 +354,9 @@ public long truncateInvalidMsg() {
             return -1;
         }
 
-        long reputFromOffset = this.defaultMessageStore.getMaxPhyOffset() - dispatchBehind;
-
         boolean doNext = true;
-        while (reputFromOffset < this.defaultMessageStore.getMaxPhyOffset() && doNext) {
+        long reputFromOffset = this.defaultMessageStore.getMaxPhyOffset() - dispatchBehind;
+        do {
             SelectMappedBufferResult result = this.defaultMessageStore.getCommitLog().getData(reputFromOffset);
             if (result == null) {
                 break;
@@ -369,10 +368,8 @@ public long truncateInvalidMsg() {
                 int readSize = 0;
                 while (readSize < result.getSize()) {
                     DispatchRequest dispatchRequest = this.defaultMessageStore.getCommitLog().checkMessageAndReturnSize(result.getByteBuffer(), false, false);
-
-                    int size = dispatchRequest.getMsgSize();
-
                     if (dispatchRequest.isSuccess()) {
+                        int size = dispatchRequest.getMsgSize();
                         if (size > 0) {
                             reputFromOffset += size;
                             readSize += size;
@@ -388,7 +385,7 @@ public long truncateInvalidMsg() {
             } finally {
                 result.release();
             }
-        }
+        } while (reputFromOffset < this.defaultMessageStore.getMaxPhyOffset() && doNext);
 
         LOGGER.info("Truncate commitLog to {}", reputFromOffset);
         this.defaultMessageStore.truncateDirtyFiles(reputFromOffset);