[rocketmq] branch develop updated: [ISSUE #7077] Schedule CQ offset invalid. offset=77, cqMinOffset=0, cqMaxOffset=74, queueId=1 (#7084)

[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 8bcc94829d [ISSUE #7077] Schedule CQ offset invalid. offset=77, 
cqMinOffset=0, cqMaxOffset=74, queueId=1 (#7084)
8bcc94829d is described below

commit 8bcc94829d2ef2597a8eeab3c6b7099432a0bea1
Author: weihubeats <weihube...@163.com>
AuthorDate: Tue Aug 1 10:15:07 2023 +0800

    [ISSUE #7077] Schedule CQ offset invalid. offset=77, cqMinOffset=0, 
cqMaxOffset=74, queueId=1 (#7084)
    
    * Adding null does not update
    
    * delete slave put correctDelayOffset
    
    * Remove duplicate delayOffset file loading
    
    * add loadWhenSyncDelayOffset
    
    * add method
    
    * add method
---
 .../org/apache/rocketmq/broker/schedule/ScheduleMessageService.java | 6 ++++++
 .../java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
index 2a4ace0985..26f09dcd03 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/schedule/ScheduleMessageService.java
@@ -223,6 +223,12 @@ public class ScheduleMessageService extends ConfigManager {
         result = result && this.correctDelayOffset();
         return result;
     }
+    
+    public boolean loadWhenSyncDelayOffset() {
+        boolean result = super.load();
+        result = result && this.parseDelayLevel();
+        return result;
+    }
 
     public boolean correctDelayOffset() {
         try {
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java 
b/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java
index b9de5173be..53cdecdf85 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java
@@ -152,7 +152,7 @@ public class SlaveSynchronize {
                                     
.getMessageStoreConfig().getStorePathRootDir());
                     try {
                         MixAll.string2File(delayOffset, fileName);
-                        
this.brokerController.getScheduleMessageService().load();
+                        
this.brokerController.getScheduleMessageService().loadWhenSyncDelayOffset();
                     } catch (IOException e) {
                         LOGGER.error("Persist file Exception, {}", fileName, 
e);
                     }