[rocketmq] branch develop updated: 修复issue556 EpollEventLoopGroup启动失败的bug

[dinglei]

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

dinglei pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0767a9d  修复issue556 EpollEventLoopGroup启动失败的bug
     new e7fcb28  Merge pull request #689 from Black-Mamba24/master
0767a9d is described below

commit 0767a9d5f926f6295509e409228b4d95e8094cb5
Author: Black-Mamba24 <329926...@qq.com>
AuthorDate: Tue Jan 15 21:28:33 2019 +0800

    修复issue556 EpollEventLoopGroup启动失败的bug
---
 .../remoting/netty/NettyRemotingServer.java        | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 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 1984842..c9691ba 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
@@ -108,16 +108,16 @@ public class NettyRemotingServer extends 
NettyRemotingAbstract implements Remoti
             }
         });
 
-        this.eventLoopGroupBoss = new NioEventLoopGroup(1, new ThreadFactory() 
{
-            private AtomicInteger threadIndex = new AtomicInteger(0);
+        if (useEpoll()) {
+            this.eventLoopGroupBoss = new EpollEventLoopGroup(1, new 
ThreadFactory() {
+                private AtomicInteger threadIndex = new AtomicInteger(0);
 
-            @Override
-            public Thread newThread(Runnable r) {
-                return new Thread(r, String.format("NettyBoss_%d", 
this.threadIndex.incrementAndGet()));
-            }
-        });
+                @Override
+                public Thread newThread(Runnable r) {
+                    return new Thread(r, String.format("NettyEPOLLBoss_%d", 
this.threadIndex.incrementAndGet()));
+                }
+            });
 
-        if (useEpoll()) {
             this.eventLoopGroupSelector = new 
EpollEventLoopGroup(nettyServerConfig.getServerSelectorThreads(), new 
ThreadFactory() {
                 private AtomicInteger threadIndex = new AtomicInteger(0);
                 private int threadTotal = 
nettyServerConfig.getServerSelectorThreads();
@@ -128,6 +128,15 @@ public class NettyRemotingServer extends 
NettyRemotingAbstract implements Remoti
                 }
             });
         } else {
+            this.eventLoopGroupBoss = new NioEventLoopGroup(1, new 
ThreadFactory() {
+                private AtomicInteger threadIndex = new AtomicInteger(0);
+
+                @Override
+                public Thread newThread(Runnable r) {
+                    return new Thread(r, String.format("NettyNIOBoss_%d", 
this.threadIndex.incrementAndGet()));
+                }
+            });
+
             this.eventLoopGroupSelector = new 
NioEventLoopGroup(nettyServerConfig.getServerSelectorThreads(), new 
ThreadFactory() {
                 private AtomicInteger threadIndex = new AtomicInteger(0);
                 private int threadTotal = 
nettyServerConfig.getServerSelectorThreads();