Merge 66d7fa0e17 into 2fb0fce0b1

perf: The new metrics of getTransferredTps for rocketmq5.x and the old metrics of getTransferedTps for rocketmq4.x (#197 )
Co-authored-by: jinwei2 <jinwei2@enmonster.com>
2026-06-09 14:23:22 +08:00 · 2024-05-09 16:34:36 +08:00 · 2024-03-26 17:02:16 +08:00 · 2023-01-11 14:22:41 +08:00
2 changed files with 12 additions and 1 deletions
--- a/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/apache/rocketmq/dashboard/service/impl/TopicServiceImpl.java
@@ -128,6 +128,10 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
            for (String brokerName : changeToBrokerNameSet(clusterInfo.getClusterAddrTable(),
                topicCreateOrUpdateRequest.getClusterNameList(), topicCreateOrUpdateRequest.getBrokerNameList())) {
                mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
+                if (topicCreateOrUpdateRequest.isOrder()) {
+                    String orderConf = brokerName + ":" + topicConfig.getWriteQueueNums();
+                    mqAdminExt.createOrUpdateOrderConf(topicConfig.getTopicName(), orderConf, false);
+                }
            }
        } catch (Exception err) {
            Throwables.throwIfUnchecked(err);
--- a/src/main/resources/static/view/pages/cluster.html
+++ b/src/main/resources/static/view/pages/cluster.html
@@ -50,7 +50,14 @@
                <td class="text-center">{{instance.address}}</td>
                <td class="text-center">{{instance.brokerVersionDesc}}</td>
                <td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
-                <td class="text-center">{{instance.getTransferedTps.split(' ')[0]| number:2}}</td>
+                <td class="text-center">
+                    <span ng-if="!instance.getTransferedTps || !instance.getTransferedTps.trim()">
+                        {{instance.getTransferredTps.split(' ')[0] | number:2}}
+                    </span>
+                    <span ng-if="instance.getTransferedTps && instance.getTransferedTps.trim()">
+                        {{instance.getTransferedTps.split(' ')[0] | number:2}}
+                    </span>
+                </td>
                <td class="text-center">{{instance.msgPutTotalTodayMorning -
                    instance.msgPutTotalYesterdayMorning}}
                </td>
Author	SHA1	Message	Date
Slideee	e45988643a	Merge `66d7fa0e17` into `2fb0fce0b1`	2024-05-09 16:34:36 +08:00
Javen	2fb0fce0b1	perf: The new metrics of getTransferredTps for rocketmq5.x and the old metrics of getTransferedTps for rocketmq4.x (#197 ) Co-authored-by: jinwei2 <jinwei2@enmonster.com>	2024-03-26 17:02:16 +08:00
yechun	66d7fa0e17	[ISSUE #137 ]Fix the bug of topic create or update when order is true	2023-01-11 14:22:41 +08:00