From 15f14248c4fb0242eb27ee3ee5541261b3d5f2ed Mon Sep 17 00:00:00 2001 From: shizhili Date: Mon, 11 Dec 2023 15:45:46 +0800 Subject: [PATCH] backport slaveActingMaster Timer Message retry without escape logic --- ...r-Message-retry-without-escape-logic.patch | 31 +++++++++++++++++++ rocketmq.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch diff --git a/patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch b/patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch new file mode 100644 index 0000000..d8498d9 --- /dev/null +++ b/patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch @@ -0,0 +1,31 @@ +From e955e4399ceed5b5a1fbadc400883cfc5f99e726 Mon Sep 17 00:00:00 2001 +From: AYue <40812847+AYue-94@users.noreply.github.com> +Date: Fri, 24 Nov 2023 10:47:08 +0800 +Subject: [PATCH] [ISSUE #7577] SlaveActingMaster Timer Message retry without + escape logic (#7578) + +Co-authored-by: ayue +--- + .../org/apache/rocketmq/store/timer/TimerMessageStore.java | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java +index 3ab51a26d..d796e4467 100644 +--- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java ++++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java +@@ -1105,7 +1105,11 @@ public class TimerMessageStore { + } + } + Thread.sleep(50); +- putMessageResult = messageStore.putMessage(message); ++ if (escapeBridgeHook != null) { ++ putMessageResult = escapeBridgeHook.apply(message); ++ } else { ++ putMessageResult = messageStore.putMessage(message); ++ } + LOGGER.warn("Retrying to do put timer msg retryNum:{} putRes:{} msg:{}", retryNum, putMessageResult, message); + } + return PUT_NO_RETRY; +-- +2.32.0.windows.2 + diff --git a/rocketmq.spec b/rocketmq.spec index e99cff8..e51332a 100644 --- a/rocketmq.spec +++ b/rocketmq.spec @@ -5,7 +5,7 @@ Summary: Cloud-Native, Distributed Messaging and Streaming Name: rocketmq Version: 5.1.5 -Release: 38 +Release: 39 License: Apache-2.0 Group: Applications/Message URL: https://rocketmq.apache.org/ @@ -47,6 +47,7 @@ Patch0034: patch034-backport-Let-consumer-be-aware-of-message-queue-assignment-c Patch0035: patch035-backport-fix-some-bugs.patch Patch0036: patch036-backport-RIP65.patch Patch0037: patch037-backport-Retry-topic-v2-in-pop.patch +Patch0038: patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git Requires: java-1.8.0-openjdk-devel @@ -87,6 +88,9 @@ exit 0 %changelog +* Mon Dec 11 2023 ShiZhili - 5.1.3-39 +- backport SlaveActingMaster Timer Message retry without escape logic + * Mon Dec 11 2023 ShiZhili - 5.1.3-38 - backport Retry topic v2 in pop