From b31e0cea00a8d95921877fd8c1e4239717b05a9e Mon Sep 17 00:00:00 2001 From: Zhouxiang Zhan Date: Wed, 26 Jun 2024 19:04:45 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"[ISSUE=20#7686]=20The=20bornTime=20is?= =?UTF-8?q?=20not=20set=20when=20using=20the=20popMessage=20API=20i?= =?UTF-8?q?=E2=80=A6"=20(#8331)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4bb4d78f1d5a8d920b85675ef9628a75b2a86f98. --- .../org/apache/rocketmq/proxy/processor/ConsumerProcessor.java | 1 - .../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 9adf20ebba2..24fc0a2a28f 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,7 +137,6 @@ public CompletableFuture 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 index 9181f966f4c..aaa688fee64 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,6 +195,7 @@ public CompletableFuture endTransactionOneway(ProxyContext ctx, String bro @Override public CompletableFuture popMessage(ProxyContext ctx, AddressableMessageQueue messageQueue, PopMessageRequestHeader requestHeader, long timeoutMillis) { + requestHeader.setBornTime(System.currentTimeMillis()); RemotingCommand request = LocalRemotingCommand.createRequestCommand(RequestCode.POP_MESSAGE, requestHeader, ctx.getLanguage()); CompletableFuture future = new CompletableFuture<>(); SimpleChannel channel = channelManager.createInvocationChannel(ctx);