This is an automated email from the ASF dual-hosted git repository. zhouxzhan pushed a commit to branch revert-7687-hotfix/fix_pop_born_time in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 1102a54c1cb237ff4adba9119d1b94866f7f4dca Author: Zhouxiang Zhan <[email protected]> AuthorDate: Wed Jun 26 13:49:33 2024 +0800 Revert "[ISSUE #7686] The bornTime is not set when using the popMessage API i…" This reverts commit 4bb4d78f1d5a8d920b85675ef9628a75b2a86f98. --- .../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 9adf20ebba..24fc0a2a28 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 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 9181f966f4..aaa688fee6 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 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);
