From 417de132a75e790dc0d36c1884e70cc9bfcba0f5 Mon Sep 17 00:00:00 2001
From: CalvinKirs <acm_master@163.com>
Date: Fri, 4 Sep 2020 11:10:03 +0800
Subject: [PATCH]  [improvement][remote]use EpollServerSocketChannel when
 system is linux (#3657)

---
 .../remote/NettyRemotingClient.java           |  3 +--
 .../remote/NettyRemotingServer.java           |  3 +--
 .../remote/utils/NettyUtils.java              | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
index 92e3cae85..e5e3430ff 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
@@ -27,7 +27,6 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
 
 import org.apache.dolphinscheduler.remote.codec.NettyDecoder;
 import org.apache.dolphinscheduler.remote.codec.NettyEncoder;
@@ -155,7 +154,7 @@ public class NettyRemotingClient {
 
         this.bootstrap
             .group(this.workerGroup)
-            .channel(NioSocketChannel.class)
+            .channel(NettyUtils.getSocketChannelClass())
             .option(ChannelOption.SO_KEEPALIVE, clientConfig.isSoKeepalive())
             .option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
             .option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
index e96f22aaf..3fa63c3cb 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
@@ -25,7 +25,6 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 
 import org.apache.dolphinscheduler.remote.codec.NettyDecoder;
@@ -146,7 +145,7 @@ public class NettyRemotingServer {
         if (isStarted.compareAndSet(false, true)) {
             this.serverBootstrap
                 .group(this.bossGroup, this.workGroup)
-                .channel(NioServerSocketChannel.class)
+                .channel(NettyUtils.getServerSocketChannelClass())
                 .option(ChannelOption.SO_REUSEADDR, true)
                 .option(ChannelOption.SO_BACKLOG, serverConfig.getSoBacklog())
                 .childOption(ChannelOption.SO_KEEPALIVE, serverConfig.isSoKeepalive())
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NettyUtils.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NettyUtils.java
index 3e242bd95..89eb1f960 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NettyUtils.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/NettyUtils.java
@@ -18,6 +18,12 @@
 package org.apache.dolphinscheduler.remote.utils;
 
 import io.netty.channel.epoll.Epoll;
+import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.netty.channel.epoll.EpollSocketChannel;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
 
 /**
  * NettyUtils
@@ -39,4 +45,18 @@ public class NettyUtils {
         return Boolean.parseBoolean(enableNettyEpoll);
     }
 
+    public static Class<? extends ServerSocketChannel> getServerSocketChannelClass() {
+        if (useEpoll()) {
+            return EpollServerSocketChannel.class;
+        }
+        return NioServerSocketChannel.class;
+    }
+
+    public static Class<? extends SocketChannel> getSocketChannelClass() {
+        if (useEpoll()) {
+            return EpollSocketChannel.class;
+        }
+        return NioSocketChannel.class;
+    }
+
 }
-- 
GitLab