packages/rocketmq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport slaveActingMaster Timer Message retry without escape logic

Browse Source
This commit is contained in:
shizhili 2023-12-11 15:45:46 +08:00
parent cd83ae768b
commit 15f14248c4
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patch038-backport-SlaveActingMaster-Timer-Message-retry-without-escape-logic.patch Normal file
View File

@ -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 <ericyu0421@163.com>
---
.../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

6
rocketmq.spec
View File

@ -5,7 +5,7 @@
Summary: Cloud-Native, Distributed Messaging and Streaming Summary: Cloud-Native, Distributed Messaging and Streaming
Name: rocketmq Name: rocketmq
Version: 5.1.5 Version: 5.1.5
Release: 38 Release: 39
License: Apache-2.0 License: Apache-2.0
Group: Applications/Message Group: Applications/Message
URL: https://rocketmq.apache.org/ 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 Patch0035: patch035-backport-fix-some-bugs.patch
Patch0036: patch036-backport-RIP65.patch Patch0036: patch036-backport-RIP65.patch
Patch0037: patch037-backport-Retry-topic-v2-in-pop.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 BuildRequires: java-1.8.0-openjdk-devel, maven, maven-local, git
Requires: java-1.8.0-openjdk-devel Requires: java-1.8.0-openjdk-devel
@ -87,6 +88,9 @@ exit 0
%changelog %changelog
* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-39
- backport SlaveActingMaster Timer Message retry without escape logic
* Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-38 * Mon Dec 11 2023 ShiZhili <shizhili_yewu@cmss.chinamobile.com> - 5.1.3-38
- backport Retry topic v2 in pop - backport Retry topic v2 in pop