Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ISSUE #7305] Fix metrics and transactional module not shutdown while broker offline cause coredump #7307

Merged
merged 1 commit into from
Sep 6, 2023
Merged

[ISSUE #7305] Fix metrics and transactional module not shutdown while broker offline cause coredump #7307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,10 @@ protected void shutdownBasicService() {
this.fastRemotingServer.shutdown();
}

if (this.brokerMetricsManager != null) {
this.brokerMetricsManager.shutdown();
}

if (this.brokerStatsManager != null) {
this.brokerStatsManager.shutdown();
}
Expand All @@ -1324,6 +1328,10 @@ protected void shutdownBasicService() {
this.ackMessageProcessor.shutdownPopReviveService();
}

if (this.transactionalMessageService != null) {
this.transactionalMessageService.close();
}

if (this.notificationProcessor != null) {
this.notificationProcessor.getPopLongPollingService().shutdown();
}
Expand Down
4 changes: 3 additions & 1 deletion ...in/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,9 @@ public boolean open() {

@Override
public void close() {

if (this.transactionalOpBatchService != null) {
this.transactionalOpBatchService.shutdown();
}
}

public Message getOpMessage(int queueId, String moreData) {
Expand Down
Loading