[IOTDB-1639] Refactoring the cluster class structure to make it consistent with the server module

.gitignore

@@ -3,7 +3,6 @@
 **/logs/*
 **/lib/**
 **/data/**
-**/raft/**
 
 # Python runtime file
 **/__pycache__/**

cli/pom.xml

@@ -80,6 +80,11 @@
             <artifactId>commons-csv</artifactId>
             <version>1.9.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

cluster/pom.xml

@@ -125,6 +125,10 @@
             <artifactId>powermock-api-mockito2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

cluster/src/assembly/resources/conf/iotdb-cluster.properties

@@ -64,11 +64,6 @@ seed_nodes=127.0.0.1:9003
 # WARNING: this must be consistent across all nodes in the cluster
 # rpc_thrift_compression_enable=false
 
-# max client connections created by thrift
-# this configuration applies separately to data/meta/client connections and thus does not control
-# the number of global connections
-# max_concurrent_client_num=10000
-
 # number of replications for one partition
 default_replica_num=1
 

cluster/src/assembly/resources/sbin/add-node.bat

@@ -87,7 +87,7 @@ IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
 
 @setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
 set CONF_PARAMS=-a
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterMain
+if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterIoTDB
 if NOT DEFINED JAVA_HOME goto :err
 
 @REM -----------------------------------------------------------------------------

cluster/src/assembly/resources/sbin/add-node.sh

@@ -75,7 +75,7 @@ CLASSPATH=""
 for f in ${IOTDB_HOME}/lib/*.jar; do
   CLASSPATH=${CLASSPATH}":"$f
 done
-classname=org.apache.iotdb.cluster.ClusterMain
+classname=org.apache.iotdb.cluster.ClusterIoTDB
 
 launch_service()
 {

cluster/src/assembly/resources/sbin/remove-node.bat

@@ -64,7 +64,7 @@ for %%i in (%*) do (
 	set CONF_PARAMS=!CONF_PARAMS! %%i
 )
 
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterMain
+if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterIoTDB
 if NOT DEFINED JAVA_HOME goto :err
 
 @REM -----------------------------------------------------------------------------
@@ -82,7 +82,7 @@ set CLASSPATH="%IOTDB_HOME%\lib"
 
 @REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
 set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*"
-set CLASSPATH=%CLASSPATH%;iotdb.ClusterMain
+set CLASSPATH=%CLASSPATH%;iotdb.ClusterIoTDB
 goto okClasspath
 
 :append

cluster/src/assembly/resources/sbin/remove-node.sh

@@ -51,7 +51,7 @@ CLASSPATH=""
 for f in ${IOTDB_HOME}/lib/*.jar; do
   CLASSPATH=${CLASSPATH}":"$f
 done
-classname=org.apache.iotdb.cluster.ClusterMain
+classname=org.apache.iotdb.cluster.ClusterIoTDB
 
 launch_service()
 {

cluster/src/assembly/resources/sbin/start-node.bat

@@ -87,7 +87,7 @@ IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
 
 @setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
 set CONF_PARAMS=-s
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterMain
+if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cluster.ClusterIoTDB
 if NOT DEFINED JAVA_HOME goto :err
 
 @REM -----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ set CLASSPATH="%IOTDB_HOME%\lib"
 
 @REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
 set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*"
-set CLASSPATH=%CLASSPATH%;iotdb.ClusterMain
+set CLASSPATH=%CLASSPATH%;iotdb.ClusterIoTDB
 goto okClasspath
 
 :append

cluster/src/assembly/resources/sbin/start-node.sh

@@ -76,7 +76,7 @@ CLASSPATH=""
 for f in ${IOTDB_HOME}/lib/*.jar; do
   CLASSPATH=${CLASSPATH}":"$f
 done
-classname=org.apache.iotdb.cluster.ClusterMain
+classname=org.apache.iotdb.cluster.ClusterIoTDB
 
 launch_service()
 {

cluster/src/assembly/resources/sbin/stop-node.bat

@@ -23,5 +23,5 @@ pushd..
 set exec_dir=%cd%
 popd
 set exec_dir=%exec_dir:\=\\%
-wmic process where (commandline like "%%iotdb.ClusterMain%%" and not name="wmic.exe" and  commandline  like "%%%exec_dir%%%") delete
+wmic process where (commandline like "%%iotdb.ClusterIoTDB%%" and not name="wmic.exe" and  commandline  like "%%%exec_dir%%%") delete
 

cluster/src/assembly/resources/sbin/stop-node.sh

@@ -19,7 +19,7 @@
 #
 
 
-PIDS=$(ps ax | grep -i 'ClusterMain' | grep java | grep -v grep | awk '{print $1}')
+PIDS=$(ps ax | grep -i 'ClusterIoTDB' | grep java | grep -v grep | awk '{print $1}')
 sig=0
 for every_pid in ${PIDS}
 do

cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java

@@ -54,7 +54,6 @@
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
@@ -277,7 +276,7 @@ private static long connectClient(Client client) throws TException {
   @SuppressWarnings({"java:S2095"}) // the transport is used later
   private static Client getClient(String ip, int port) throws TTransportException {
     TSIService.Client.Factory factory = new Factory();
-    TTransport transport = RpcTransportFactory.INSTANCE.getTransport(new TSocket(ip, port));
+    TTransport transport = RpcTransportFactory.INSTANCE.getTransportWithNoTimeout(ip, port);
     transport.open();
     TProtocol protocol =
         IoTDBDescriptor.getInstance().getConfig().isRpcThriftCompressionEnable()