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 9b4f16a5b4 [ISSUE #7914] Fix the issue that pop revive msg to retry 
topic may lose messages  (#7915)
9b4f16a5b4 is described below

commit 9b4f16a5b45fe740eead6e67781b796efd869be8
Author: fujian-zfj <2573259...@qq.com>
AuthorDate: Mon Mar 18 14:08:35 2024 +0800

    [ISSUE #7914] Fix the issue that pop revive msg to retry topic may lose 
messages  (#7915)
    
    * typo int readme[ecosystem]
    
    * fix pop problem
---
 .../java/org/apache/rocketmq/broker/processor/PopReviveService.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
index 104b78d441..4fab3d500b 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
@@ -541,11 +541,6 @@ public class PopReviveService extends ServiceThread {
 
                         }
                     }
-                    //skip ck from last epoch
-                    if (popCheckPoint.getPopTime() < 
message.getStoreTimestamp()) {
-                        POP_LOGGER.warn("reviveQueueId={}, skip ck from last 
epoch {}", queueId, popCheckPoint);
-                        return new Pair<>(msgOffset, true);
-                    }
                     boolean result = reviveRetry(popCheckPoint, message);
                     return new Pair<>(msgOffset, result);
                 });

Reply via email to