[ISSUE #7466] Added fast failure in adminBrokerThreadPoolQueue (#7466) (

#7798)
apache · Jun 17, 2024 · 568950b · 568950b
1 parent 38c56cd
commit 568950b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -115,6 +115,9 @@ private void cleanExpiredRequest() {
 
         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
@@ -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 String getMsgTraceTopicName() {
         return msgTraceTopicName;
     }
 
+    public long getWaitTimeMillsInAdminBrokerQueue() {
+        return waitTimeMillsInAdminBrokerQueue;
+    }
+
+    public void setWaitTimeMillsInAdminBrokerQueue(long waitTimeMillsInAdminBrokerQueue) {
+        this.waitTimeMillsInAdminBrokerQueue = waitTimeMillsInAdminBrokerQueue;
+    }
+
     public void setMsgTraceTopicName(String msgTraceTopicName) {
         this.msgTraceTopicName = msgTraceTopicName;
     }