[ISSUE apache#7686] The bornTime is not set when using the popMessage…

… API in cluster mode. (apache#7687) * The bornTime is not set when using the popMessage API in cluster mode. --------- Co-authored-by: ShuangxiDing <[email protected]>
Oliverwqcwrw · Dec 22, 2023 · 4bb4d78 · 4bb4d78
1 parent 2c898c9
commit 4bb4d78
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -137,6 +137,7 @@ public CompletableFuture<PopResult> popMessage(
             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
@@ -195,7 +195,6 @@ public CompletableFuture<Void> endTransactionOneway(ProxyContext ctx, String bro
     @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);