JAMES-3715 AbstractConfigurableAsyncServer: Remove no longer used max…

…ExecutorThreads Computation are now conducted on the child threads of the Netty4 Server bootstraps. On Netty 3 those computations were conducted on a thread pool yet separated from the Netty 'workers' which could be seen as unnecessary context switches - Netty worker threads were merely decoding and encoding the traffic.
apache · Feb 27, 2022 · 124c8cb · 124c8cb
1 parent d5cf674
commit 124c8cb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/...ols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/...ols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -249,11 +249,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 
             try {
                 try {
-                    if (cp.get(NettyConstants.EXECUTION_HANDLER) != null) {
-                        cp.addBefore(NettyConstants.EXECUTION_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
-                    } else {
-                        cp.addBefore(NettyConstants.CORE_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
-                    }
+                    cp.addBefore(NettyConstants.CORE_HANDLER, NettyConstants.HEARTBEAT_HANDLER, heartbeatHandler);
                 } catch (IllegalArgumentException e) {
                     LOGGER.info("heartbeat handler is already part of this pipeline", e);
                 }

diff --git a/...ocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java b/...ocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java
@@ -41,7 +41,6 @@ public interface NettyConstants {
     String CONNECTION_LIMIT_PER_IP_HANDLER = "connectionPerIpLimitHandler";
     String CONNECTION_COUNT_HANDLER = "connectionCountHandler";
     String CHUNK_WRITE_HANDLER = "chunkWriteHandler";
-    String EXECUTION_HANDLER = "executionHandler";
     String HEARTBEAT_HANDLER = "heartbeatHandler";
 
     AttributeKey<ImapSession> IMAP_SESSION_ATTRIBUTE_KEY = AttributeKey.valueOf("ImapSession");

diff --git a/...y/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/...y/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
@@ -80,8 +80,6 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
     /** The name of the parameter defining the service hello name. */
     public static final String HELLO_NAME = "helloName";
 
-    public static final int DEFAULT_MAX_EXECUTOR_COUNT = 16;
-
     private FileSystem fileSystem;
 
     private boolean enabled;
@@ -118,8 +116,6 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe
 
     private ChannelHandlerFactory frameHandlerFactory;
 
-    private int maxExecutorThreads;
-
     private MBeanServer mbeanServer;
 
     private int port;
@@ -189,8 +185,6 @@ public final void configure(HierarchicalConfiguration<ImmutableNode> config) thr
         int ioWorker = config.getInt("ioWorkerCount", DEFAULT_IO_WORKER_COUNT);
         setIoWorkerCount(ioWorker);
 
-        maxExecutorThreads = config.getInt("maxExecutorCount", DEFAULT_MAX_EXECUTOR_COUNT);
-
 
         configureHelloName(config);