[incubator-iotdb] branch cluster_receiver_wait updated: use TThreadedSelectorServer

[jiangtian]

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

jiangtian pushed a commit to branch cluster_receiver_wait
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster_receiver_wait by this 
push:
     new fa271c0  use TThreadedSelectorServer
     new ed23591  Merge branch 'cluster_receiver_wait' of 
github.com:apache/incubator-iotdb into cluster_receiver_wait
fa271c0 is described below

commit fa271c07336bcd78575baf454585d505b6e880e7
Author: jt2594838 <jt2594...@163.com>
AuthorDate: Fri Aug 28 16:59:40 2020 +0800

    use TThreadedSelectorServer
---
 .../org/apache/iotdb/cluster/server/RaftServer.java     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
index 79f37ca..c161641 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
@@ -36,10 +36,9 @@ import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.server.THsHaServer;
-import org.apache.thrift.server.THsHaServer.Args;
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.server.TThreadPoolServer;
+import org.apache.thrift.server.TThreadedSelectorServer;
 import org.apache.thrift.transport.TFastFramedTransport;
 import org.apache.thrift.transport.TNonblockingServerTransport;
 import org.apache.thrift.transport.TServerTransport;
@@ -182,13 +181,11 @@ public abstract class RaftServer implements 
RaftService.AsyncIface, RaftService.
 
   private TServer getAsyncServer() throws TTransportException {
     socket = getServerSocket();
-    Args poolArgs =
-        new THsHaServer.Args((TNonblockingServerTransport) socket)
-            .maxWorkerThreads(config.getMaxConcurrentClientNum())
-            .minWorkerThreads(CommonUtils.getCpuCores());
-
-    poolArgs.executorService(new ThreadPoolExecutor(poolArgs.minWorkerThreads,
-        poolArgs.maxWorkerThreads, poolArgs.getStopTimeoutVal(), 
poolArgs.getStopTimeoutUnit(),
+    TThreadedSelectorServer.Args poolArgs =
+        new TThreadedSelectorServer.Args((TNonblockingServerTransport) socket);
+    poolArgs.selectorThreads(CommonUtils.getCpuCores());
+    poolArgs.executorService(new ThreadPoolExecutor(CommonUtils.getCpuCores(),
+        config.getMaxConcurrentClientNum(), poolArgs.getStopTimeoutVal(), 
poolArgs.getStopTimeoutUnit(),
         new SynchronousQueue<>(), new ThreadFactory() {
       private AtomicLong threadIndex = new AtomicLong(0);
 
@@ -205,7 +202,7 @@ public abstract class RaftServer implements 
RaftService.AsyncIface, RaftService.
         IoTDBDescriptor.getInstance().getConfig().getThriftMaxFrameSize()));
 
     // run the thrift server in a separate thread so that the main thread is 
not blocked
-    return new THsHaServer(poolArgs);
+    return new TThreadedSelectorServer(poolArgs);
   }
 
   private TServer getSyncServer() throws TTransportException {