From 845f468129b2c4159bf0d5e5854f441b67e3c73c Mon Sep 17 00:00:00 2001
From: lizhimins <707364882@qq.com>
Date: Fri, 20 Sep 2024 17:19:23 +0800
Subject: [PATCH] [ISSUE #8720] Support disable netty server worker group by
 config (#8721)

---
 .../rocketmq/remoting/netty/NettyRemotingServer.java     | 5 +++--
 .../rocketmq/remoting/netty/NettyServerConfig.java       | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
index 8a329a37ac9..cbf25c23c60 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
@@ -270,8 +270,9 @@ public void run(Timeout timeout) {
      */
     protected ChannelPipeline configChannel(SocketChannel ch) {
         return ch.pipeline()
-            .addLast(defaultEventExecutorGroup, HANDSHAKE_HANDLER_NAME, new HandshakeHandler())
-            .addLast(defaultEventExecutorGroup,
+            .addLast(nettyServerConfig.isServerNettyWorkerGroupEnable() ? defaultEventExecutorGroup : null,
+                HANDSHAKE_HANDLER_NAME, new HandshakeHandler())
+            .addLast(nettyServerConfig.isServerNettyWorkerGroupEnable() ? defaultEventExecutorGroup : null,
                 encoder,
                 new NettyDecoder(),
                 distributionHandler,
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyServerConfig.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyServerConfig.java
index 6564404b920..664dee8371c 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyServerConfig.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyServerConfig.java
@@ -36,6 +36,7 @@ public class NettyServerConfig implements Cloneable {
     private int writeBufferHighWaterMark = NettySystemConfig.writeBufferHighWaterMark;
     private int writeBufferLowWaterMark = NettySystemConfig.writeBufferLowWaterMark;
     private int serverSocketBacklog = NettySystemConfig.socketBacklog;
+    private boolean serverNettyWorkerGroupEnable = true;
     private boolean serverPooledByteBufAllocatorEnable = true;
 
     private boolean enableShutdownGracefully = false;
@@ -175,6 +176,14 @@ public void setWriteBufferHighWaterMark(int writeBufferHighWaterMark) {
         this.writeBufferHighWaterMark = writeBufferHighWaterMark;
     }
 
+    public boolean isServerNettyWorkerGroupEnable() {
+        return serverNettyWorkerGroupEnable;
+    }
+
+    public void setServerNettyWorkerGroupEnable(boolean serverNettyWorkerGroupEnable) {
+        this.serverNettyWorkerGroupEnable = serverNettyWorkerGroupEnable;
+    }
+
     public boolean isEnableShutdownGracefully() {
         return enableShutdownGracefully;
     }