(rocketmq) branch develop updated: [ISSUE #8835] When ck is in the buffer, incomplete ack will lead to message duplication. (#8836)

[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 031687dbd7 [ISSUE #8835] When ck is in the buffer, incomplete ack will 
lead to message duplication. (#8836)
031687dbd7 is described below

commit 031687dbd78df0c52f1b2a73a7e12b203453128f
Author: Ji Juntao <juntao....@alibaba-inc.com>
AuthorDate: Thu Oct 17 19:16:14 2024 +0800

    [ISSUE #8835] When ck is in the buffer, incomplete ack will lead to message 
duplication. (#8836)
    
    * add brokerName in ackMsg
    
    * add brokerName in ackMsg
---
 .../java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
index e05ab8ebea..9f10b483dd 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
@@ -644,6 +644,7 @@ public class PopBufferMergeService extends ServiceThread {
         ackMsg.setTopic(point.getTopic());
         ackMsg.setQueueId(point.getQueueId());
         ackMsg.setPopTime(point.getPopTime());
+        ackMsg.setBrokerName(point.getBrokerName());
         msgInner.setTopic(popMessageProcessor.reviveTopic);
         
msgInner.setBody(JSON.toJSONString(ackMsg).getBytes(DataConverter.CHARSET_UTF8));
         msgInner.setQueueId(pointWrapper.getReviveQueueId());