commit 63d9da7429177914b73c077da807506240a96ef4
author zhangjidi2016 <1017543663@qq.com> Mon Apr 11 08:27:48 2022 +0800
committer GitHub <noreply@github.com> Mon Apr 11 08:27:48 2022 +0800
tree 29ca9daa9dd56eb1aec98b559e3a7e6ce62e152d
parent daa181ccfdce84db62662e9917a77f40481dad8e

[ISSUE #82]Filter the system topic (clusterName+REPLY_TOPIC) when dashboard was making topic statistics (#83)

Co-authored-by: zhangjidi <zhangjidi@cmss.chinamobile.com>

src/main/java/org/apache/rocketmq/dashboard/task/CollectTaskRunnble.java

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 @@
                         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 @@
                                 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());
                             }
                         }
                     }

src/main/java/org/apache/rocketmq/dashboard/task/DashboardCollectTask.java

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 @@
         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);