(rocketmq) branch develop updated: Fix some ambiguous logs (#7934)

[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 9ab37b9854 Fix some ambiguous logs (#7934)
9ab37b9854 is described below

commit 9ab37b98541e875c22768458955cfe90c424881d
Author: Cai ZhaoMin <64068328+caizhaom...@users.noreply.github.com>
AuthorDate: Mon Mar 18 11:38:47 2024 +0800

    Fix some ambiguous logs (#7934)
    
    * Fix thread name ambiguity
    
    * Fix namesrv log ambiguity
---
 broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java   | 2 +-
 .../java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java 
b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index af90e5f87e..dc6b511cf4 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -490,7 +490,7 @@ public class BrokerController {
             1000 * 60,
             TimeUnit.MILLISECONDS,
             this.putThreadPoolQueue,
-            new ThreadFactoryImpl("SendMessageThread_", getBrokerIdentity()));
+            new ThreadFactoryImpl("PutMessageThread_", getBrokerIdentity()));
 
         this.ackMessageExecutor = ThreadUtils.newThreadPoolExecutor(
             this.brokerConfig.getAckMessageThreadPoolNums(),
diff --git 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
index d199283392..e3f9d0de9b 100644
--- 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
+++ 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
@@ -281,7 +281,7 @@ public class RouteInfoManager {
                     long oldStateVersion = 
oldBrokerInfo.getDataVersion().getStateVersion();
                     long newStateVersion = 
topicConfigWrapper.getDataVersion().getStateVersion();
                     if (oldStateVersion > newStateVersion) {
-                        log.warn("Registered Broker conflicts with the existed 
one, just ignore.: Cluster:{}, BrokerName:{}, BrokerId:{}, " +
+                        log.warn("Registering Broker conflicts with the 
existed one, just ignore.: Cluster:{}, BrokerName:{}, BrokerId:{}, " +
                                 "Old BrokerAddr:{}, Old Version:{}, New 
BrokerAddr:{}, New Version:{}.",
                             clusterName, brokerName, brokerId, oldBrokerAddr, 
oldStateVersion, brokerAddr, newStateVersion);
                         //Remove the rejected brokerAddr from brokerLiveTable.