You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2023/11/24 02:47:14 UTC
(rocketmq) branch develop updated: [ISSUE #7577] SlaveActingMaster Timer Message retry without escape logic (#7578)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new e955e4399c [ISSUE #7577] SlaveActingMaster Timer Message retry without escape logic (#7578)
e955e4399c is described below
commit e955e4399ceed5b5a1fbadc400883cfc5f99e726
Author: AYue <40...@users.noreply.github.com>
AuthorDate: Fri Nov 24 10:47:08 2023 +0800
[ISSUE #7577] SlaveActingMaster Timer Message retry without escape logic (#7578)
Co-authored-by: ayue <er...@163.com>
---
.../java/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 3ab51a26d3..d796e4467d 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;