(rocketmq) branch develop updated: [ISSUE #7979] Fix timerWheel message metric (#7980)

[jinrongtong]

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 bf24ffde88 [ISSUE #7979] Fix timerWheel message metric (#7980)
bf24ffde88 is described below

commit bf24ffde886dbbec719cca18eb927dc7ebad8f12
Author: hqbfz <125714719+3424672...@users.noreply.github.com>
AuthorDate: Mon Apr 1 10:47:35 2024 +0800

    [ISSUE #7979] Fix timerWheel message metric (#7980)
    
    * fix metric in TimerWheel
    
    * fix metric in TimerWheel
    
    * fix message metric in TimerWheel
    
    * fix message metric in TimerWheel
---
 .../main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 819b3e96a4..32075474b9 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
@@ -1556,6 +1556,8 @@ public class TimerMessageStore {
                             if (null != msgExt) {
                                 if (needDelete(tr.getMagic()) && 
!needRoll(tr.getMagic())) {
                                     if 
(msgExt.getProperty(MessageConst.PROPERTY_TIMER_DEL_UNIQKEY) != null && 
tr.getDeleteList() != null) {
+                                        //Execute metric plus one for messages 
that fail to be deleted
+                                        addMetric(msgExt, 1);
                                         
tr.getDeleteList().add(msgExt.getProperty(MessageConst.PROPERTY_TIMER_DEL_UNIQKEY));
                                     }
                                     tr.idempotentRelease();
@@ -1566,6 +1568,8 @@ public class TimerMessageStore {
                                         LOGGER.warn("No uniqueKey for msg:{}", 
msgExt);
                                     }
                                     if (null != uniqueKey && 
tr.getDeleteList() != null && tr.getDeleteList().size() > 0 && 
tr.getDeleteList().contains(uniqueKey)) {
+                                        //Normally, it cancels out with the +1 
above
+                                        addMetric(msgExt, -1);
                                         doRes = true;
                                         tr.idempotentRelease();
                                         
perfCounterTicks.getCounter("dequeue_delete").flow(1);