(rocketmq) branch develop updated: [ISSUE #7686] The bornTime is not set when using the popMessage API in cluster mode. (#7687)

[zhouxzhan]

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

zhouxzhan 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 4bb4d78f1d [ISSUE #7686] The bornTime is not set when using the 
popMessage API in cluster mode. (#7687)
4bb4d78f1d is described below

commit 4bb4d78f1d5a8d920b85675ef9628a75b2a86f98
Author: dingshuangxi888 <dingshuangxi...@gmail.com>
AuthorDate: Fri Dec 22 15:55:00 2023 +0800

    [ISSUE #7686] The bornTime is not set when using the popMessage API in 
cluster mode. (#7687)
    
    * The bornTime is not set when using the popMessage API in cluster mode.
    
    ---------
    
    Co-authored-by: ShuangxiDing <shuangxi....@alibaba-inc.com>
---
 .../main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java | 1 +
 .../org/apache/rocketmq/proxy/service/message/LocalMessageService.java   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
index f3522b3740..7870233576 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
@@ -137,6 +137,7 @@ public class ConsumerProcessor extends AbstractProcessor {
             requestHeader.setExp(subscriptionData.getSubString());
             requestHeader.setOrder(fifo);
             requestHeader.setAttemptId(attemptId);
+            requestHeader.setBornTime(System.currentTimeMillis());
 
             future = this.serviceManager.getMessageService().popMessage(
                     ctx,
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
index aaa688fee6..9181f966f4 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
@@ -195,7 +195,6 @@ public class LocalMessageService implements MessageService {
     @Override
     public CompletableFuture<PopResult> popMessage(ProxyContext ctx, 
AddressableMessageQueue messageQueue,
         PopMessageRequestHeader requestHeader, long timeoutMillis) {
-        requestHeader.setBornTime(System.currentTimeMillis());
         RemotingCommand request = 
LocalRemotingCommand.createRequestCommand(RequestCode.POP_MESSAGE, 
requestHeader, ctx.getLanguage());
         CompletableFuture<RemotingCommand> future = new CompletableFuture<>();
         SimpleChannel channel = channelManager.createInvocationChannel(ctx);