(rocketmq) branch develop updated: [ISSUE #7466] Added fast failure in adminBrokerThreadPoolQueue (#7466) (#7798)

[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 568950bbc8 [ISSUE #7466] Added fast failure in 
adminBrokerThreadPoolQueue (#7466) (#7798)
568950bbc8 is described below

commit 568950bbc846eea24ac6431c15e22f7e506d4905
Author: YASH PATEL <121890726+yp969...@users.noreply.github.com>
AuthorDate: Mon Jun 17 12:29:17 2024 +0530

    [ISSUE #7466] Added fast failure in adminBrokerThreadPoolQueue (#7466) 
(#7798)
---
 .../org/apache/rocketmq/broker/latency/BrokerFastFailure.java  |  3 +++
 .../src/main/java/org/apache/rocketmq/common/BrokerConfig.java | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
index 3b6e9dc676..0135ac929a 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/latency/BrokerFastFailure.java
@@ -115,6 +115,9 @@ public class BrokerFastFailure {
 
         
cleanExpiredRequestInQueue(this.brokerController.getAckThreadPoolQueue(),
             brokerController.getBrokerConfig().getWaitTimeMillsInAckQueue());
+
+        
cleanExpiredRequestInQueue(this.brokerController.getAdminBrokerThreadPoolQueue(),
+            
brokerController.getBrokerConfig().getWaitTimeMillsInAdminBrokerQueue());
     }
 
     void cleanExpiredRequestInQueue(final BlockingQueue<Runnable> 
blockingQueue, final long maxWaitTimeMillsInQueue) {
diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java 
b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
index d859f965e4..378301bedd 100644
--- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
@@ -148,7 +148,7 @@ public class BrokerConfig extends BrokerIdentity {
     private long waitTimeMillsInHeartbeatQueue = 31 * 1000;
     private long waitTimeMillsInTransactionQueue = 3 * 1000;
     private long waitTimeMillsInAckQueue = 3000;
-
+    private long waitTimeMillsInAdminBrokerQueue = 5 * 1000;
     private long startAcceptSendRequestTimeStamp = 0L;
 
     private boolean traceOn = true;
@@ -1167,6 +1167,14 @@ public class BrokerConfig extends BrokerIdentity {
         return msgTraceTopicName;
     }
 
+    public long getWaitTimeMillsInAdminBrokerQueue() {
+        return waitTimeMillsInAdminBrokerQueue;
+    }
+
+    public void setWaitTimeMillsInAdminBrokerQueue(long 
waitTimeMillsInAdminBrokerQueue) {
+        this.waitTimeMillsInAdminBrokerQueue = waitTimeMillsInAdminBrokerQueue;
+    }
+
     public void setMsgTraceTopicName(String msgTraceTopicName) {
         this.msgTraceTopicName = msgTraceTopicName;
     }