[rocketmq] branch develop updated: [ISSUE #7305] Fix metrics and transactional module not shutdown while broker offline cause coredump(#7307)

[lizhimin]

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

lizhimin 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 37017dbaec [ISSUE #7305] Fix metrics and transactional module not 
shutdown while broker offline cause coredump(#7307)
37017dbaec is described below

commit 37017dbaec5c521fd529ef4aecf3658092884f84
Author: lizhimins <707364...@qq.com>
AuthorDate: Wed Sep 6 15:23:15 2023 +0800

    [ISSUE #7305] Fix metrics and transactional module not shutdown while 
broker offline cause coredump(#7307)
---
 .../main/java/org/apache/rocketmq/broker/BrokerController.java    | 8 ++++++++
 .../broker/transaction/queue/TransactionalMessageServiceImpl.java | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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 e8f9437029..6aba70cb21 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -1302,6 +1302,10 @@ public class BrokerController {
             this.fastRemotingServer.shutdown();
         }
 
+        if (this.brokerMetricsManager != null) {
+            this.brokerMetricsManager.shutdown();
+        }
+
         if (this.brokerStatsManager != null) {
             this.brokerStatsManager.shutdown();
         }
@@ -1324,6 +1328,10 @@ public class BrokerController {
             this.ackMessageProcessor.shutdownPopReviveService();
         }
 
+        if (this.transactionalMessageService != null) {
+            this.transactionalMessageService.close();
+        }
+
         if (this.notificationProcessor != null) {
             this.notificationProcessor.getPopLongPollingService().shutdown();
         }
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
index 93fa725a93..48db828e0a 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
@@ -629,7 +629,9 @@ public class TransactionalMessageServiceImpl implements 
TransactionalMessageServ
 
     @Override
     public void close() {
-
+        if (this.transactionalOpBatchService != null) {
+            this.transactionalOpBatchService.shutdown();
+        }
     }
 
     public Message getOpMessage(int queueId, String moreData) {