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 50974adaaa [ISSUE #7658] Fix bug of timer message metrics with
setDelayTimeMs
50974adaaa is described below
commit 50974adaaa75200092a4bb7fad48c6a3d4c2b1ee
Author: Lei Zhiyuan <[email protected]>
AuthorDate: Fri Jan 12 11:43:26 2024 +0800
[ISSUE #7658] Fix bug of timer message metrics with setDelayTimeMs
---
.../java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
index 39af18b9fa..307fc02ef0 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java
@@ -210,7 +210,8 @@ public class BrokerMetricsManager {
} else if (properties.get("__STARTDELIVERTIME") != null
|| properties.get(MessageConst.PROPERTY_DELAY_TIME_LEVEL) != null
|| properties.get(MessageConst.PROPERTY_TIMER_DELIVER_MS) != null
- || properties.get(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null) {
+ || properties.get(MessageConst.PROPERTY_TIMER_DELAY_SEC) != null
+ || properties.get(MessageConst.PROPERTY_TIMER_DELAY_MS) != null) {
topicMessageType = TopicMessageType.DELAY;
}
return topicMessageType;