[rocketmq] branch develop updated: [ISSUE #7283] Incorrect dledger commitlog min offset after mappedFile re delete failed (#7284)

[jinrongtong]

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

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new d000ef947d [ISSUE #7283] Incorrect dledger commitlog min offset after 
mappedFile re delete failed (#7284)
d000ef947d is described below

commit d000ef947d7c99918ceba0fa451c1e29fd84ba07
Author: yuz10 <845238...@qq.com>
AuthorDate: Thu Aug 31 09:41:33 2023 +0800

    [ISSUE #7283] Incorrect dledger commitlog min offset after mappedFile re 
delete failed (#7284)
---
 .../java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
index ec5e86d704..d5f6acdc0a 100644
--- 
a/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
+++ 
b/store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java
@@ -162,7 +162,12 @@ public class DLedgerCommitLog extends CommitLog {
         if (!mappedFileQueue.getMappedFiles().isEmpty()) {
             return mappedFileQueue.getMinOffset();
         }
-        return dLedgerFileList.getMinOffset();
+        for (MmapFile file : dLedgerFileList.getMappedFiles()) {
+            if (file.isAvailable()) {
+                return file.getFileFromOffset() + file.getStartPosition();
+            }
+        }
+        return 0;
     }
 
     @Override