You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/05/09 01:35:34 UTC

[james-project] 04/09: JAMES-3737 Execute IMAP requests on eventLoop

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit caff4d0781d0f60ea75013d8528279e81e53fd69
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Apr 18 21:12:26 2022 +0700

    JAMES-3737 Execute IMAP requests on eventLoop
    
    Avoids context switches on each IMAP requests
---
 .../org/apache/james/imap/processor/AbstractMailboxProcessor.java | 4 +++-
 .../main/java/org/apache/james/imapserver/netty/IMAPServer.java   | 4 ++--
 .../apache/james/imapserver/netty/ImapRequestFrameDecoder.java    | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index 31db867e2a..1dc0ffce2f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -71,6 +71,7 @@ import com.github.fge.lambdas.Throwing;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends AbstractProcessor<R> {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailboxProcessor.class);
@@ -355,7 +356,8 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-        }));
+        })).subscribeOn(Schedulers.elastic())
+            .then();
     }
 
     /**
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
index b220446912..ff39b32d44 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
@@ -242,10 +242,10 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
 
                 pipeline.addLast(CHUNK_WRITE_HANDLER, new ChunkedWriteHandler());
 
-                pipeline.addLast(getExecutorGroup(), REQUEST_DECODER, new ImapRequestFrameDecoder(decoder, inMemorySizeLimit,
+                pipeline.addLast(REQUEST_DECODER, new ImapRequestFrameDecoder(decoder, inMemorySizeLimit,
                     literalSizeLimit, maxLineLength));
 
-                pipeline.addLast(getExecutorGroup(), CORE_HANDLER, createCoreHandler());
+                pipeline.addLast(CORE_HANDLER, createCoreHandler());
             }
 
         };
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
index fd4e2eec8a..fc51b68c97 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
@@ -104,7 +104,9 @@ public class ImapRequestFrameDecoder extends ByteToMessageDecoder implements Net
         Map<String, Object> attachment = ctx.channel().attr(FRAME_DECODE_ATTACHMENT_ATTRIBUTE_KEY).get();
 
         Pair<ImapRequestLineReader, Integer> readerAndSize = obtainReader(ctx, in, attachment);
-        if (readerAndSize == null) return;
+        if (readerAndSize == null) {
+            return;
+        }
 
         parseImapMessage(ctx, in, attachment, readerAndSize, readerIndex)
             .ifPresent(out::add);
@@ -249,7 +251,9 @@ public class ImapRequestFrameDecoder extends ByteToMessageDecoder implements Net
                         }
                     }
                 })
-                .subscribe(o -> {},
+                .subscribe(o -> {
+
+                    },
                     ctx::fireExceptionCaught,
                     () -> {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org