You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by zh...@apache.org on 2022/04/11 00:27:54 UTC

[rocketmq-dashboard] branch master updated: [ISSUE #82]Filter the system topic (clusterName+REPLY_TOPIC) when dashboard was making topic statistics (#83)

This is an automated email from the ASF dual-hosted git repository.

zhangjidi2016 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 63d9da7  [ISSUE #82]Filter the system topic (clusterName+REPLY_TOPIC) when dashboard was making topic statistics (#83)
63d9da7 is described below

commit 63d9da7429177914b73c077da807506240a96ef4
Author: zhangjidi2016 <10...@qq.com>
AuthorDate: Mon Apr 11 08:27:48 2022 +0800

    [ISSUE #82]Filter the system topic (clusterName+REPLY_TOPIC) when dashboard was making topic statistics (#83)
    
    Co-authored-by: zhangjidi <zh...@cmss.chinamobile.com>
---
 .../java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java   | 4 ++--
 .../java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java b/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java
index 7085620..2e96566 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java
@@ -67,7 +67,7 @@ public class CollectTaskRunnble implements Runnable {
                         inTPS += bsd.getStatsMinute().getTps();
                         inMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                     } catch (Exception e) {
-                        log.warn("Exception caught: mqAdminExt get broker stats data TOPIC_PUT_NUMS failed", e.getMessage());
+                        log.warn("Exception caught: mqAdminExt get broker stats data TOPIC_PUT_NUMS failed, topic [{}]", topic, e.getMessage());
                     }
                 }
             }
@@ -82,7 +82,7 @@ public class CollectTaskRunnble implements Runnable {
                                 outTPS += bsd.getStatsMinute().getTps();
                                 outMsgCntToday += StatsAllSubCommand.compute24HourSum(bsd);
                             } catch (Exception e) {
-                                log.warn("Exception caught: mqAdminExt get broker stats data GROUP_GET_NUMS failed", e.getMessage());
+                                log.warn("Exception caught: mqAdminExt get broker stats data GROUP_GET_NUMS failed, topic [{}], group [{}]", topic, group, e.getMessage());
                             }
                         }
                     }
diff --git a/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java b/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java
index 70a558c..cbc08da 100644
--- a/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java
@@ -254,6 +254,7 @@ public class DashboardCollectTask {
         for (Map.Entry<String, Set<String>> entry : clusterTable.entrySet()) {
             String clusterName = entry.getKey();
             TopicValidator.addSystemTopic(clusterName);
+            TopicValidator.addSystemTopic(MixAll.getReplyTopic(clusterName));
             Set<String> brokerNames = entry.getValue();
             for (String brokerName : brokerNames) {
                 TopicValidator.addSystemTopic(brokerName);