This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/cluster- by this push:
new 9fdbbad [cluster-refactor] update start class name in shell/bat
script and apply (#3993)
9fdbbad is described below
commit 9fdbbad65a175d6d4d59df84c5eda354ffdf3502
Author: Jianyun Cheng <[email protected]>
AuthorDate: Sat Sep 18 17:22:44 2021 +0800
[cluster-refactor] update start class name in shell/bat script and apply
(#3993)
spotless
Co-authored-by: chengjianyun <[email protected]>
---
cluster/src/assembly/resources/sbin/add-node.bat | 2 +-
cluster/src/assembly/resources/sbin/add-node.sh | 2 +-
cluster/src/assembly/resources/sbin/remove-node.bat | 4 ++--
cluster/src/assembly/resources/sbin/remove-node.sh | 2 +-
cluster/src/assembly/resources/sbin/start-node.bat | 4 ++--
cluster/src/assembly/resources/sbin/start-node.sh | 2 +-
cluster/src/assembly/resources/sbin/stop-node.bat | 2 +-
cluster/src/assembly/resources/sbin/stop-node.sh | 2 +-
.../src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java | 11 +++--------
.../org/apache/iotdb/cluster/server/ClusterTSServiceImpl.java | 1 +
10 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/cluster/src/assembly/resources/sbin/add-node.bat
b/cluster/src/assembly/resources/sbin/add-node.bat
index 34f90f1..15a708a 100755
--- a/cluster/src/assembly/resources/sbin/add-node.bat
+++ b/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
-----------------------------------------------------------------------------
diff --git a/cluster/src/assembly/resources/sbin/add-node.sh
b/cluster/src/assembly/resources/sbin/add-node.sh
index 4deaee2..fdd3f65 100755
--- a/cluster/src/assembly/resources/sbin/add-node.sh
+++ b/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()
{
diff --git a/cluster/src/assembly/resources/sbin/remove-node.bat
b/cluster/src/assembly/resources/sbin/remove-node.bat
index 0346771..fc3202b 100755
--- a/cluster/src/assembly/resources/sbin/remove-node.bat
+++ b/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
diff --git a/cluster/src/assembly/resources/sbin/remove-node.sh
b/cluster/src/assembly/resources/sbin/remove-node.sh
index c6f89bb..0cafad1 100755
--- a/cluster/src/assembly/resources/sbin/remove-node.sh
+++ b/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()
{
diff --git a/cluster/src/assembly/resources/sbin/start-node.bat
b/cluster/src/assembly/resources/sbin/start-node.bat
index 2874aae..a23eaf8 100755
--- a/cluster/src/assembly/resources/sbin/start-node.bat
+++ b/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
diff --git a/cluster/src/assembly/resources/sbin/start-node.sh
b/cluster/src/assembly/resources/sbin/start-node.sh
index 7fcd79f..001407f 100755
--- a/cluster/src/assembly/resources/sbin/start-node.sh
+++ b/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()
{
diff --git a/cluster/src/assembly/resources/sbin/stop-node.bat
b/cluster/src/assembly/resources/sbin/stop-node.bat
index f6338b6..29c54c9 100644
--- a/cluster/src/assembly/resources/sbin/stop-node.bat
+++ b/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
diff --git a/cluster/src/assembly/resources/sbin/stop-node.sh
b/cluster/src/assembly/resources/sbin/stop-node.sh
index c5dba79..4d670c4 100644
--- a/cluster/src/assembly/resources/sbin/stop-node.sh
+++ b/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
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java
b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java
index bd0f69d..851e8a2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterIoTDB.java
@@ -119,9 +119,7 @@ public class ClusterIoTDB implements ClusterIoTDBMBean {
private boolean allowReport = true;
- /**
- * hardLinkCleaner will periodically clean expired hardlinks created during
snapshots
- */
+ /** hardLinkCleaner will periodically clean expired hardlinks created during
snapshots */
private ScheduledExecutorService hardLinkCleanerThread;
// currently, dataClientProvider is only used for those instances who do not
belong to any
@@ -485,9 +483,7 @@ public class ClusterIoTDB implements ClusterIoTDBMBean {
}
}
- /**
- * Developers may perform pre-start customizations here for debugging or
experiments.
- */
+ /** Developers may perform pre-start customizations here for debugging or
experiments. */
@SuppressWarnings("java:S125") // leaving examples
private void preStartCustomize() {
// customize data distribution
@@ -641,7 +637,6 @@ public class ClusterIoTDB implements ClusterIoTDBMBean {
private static final ClusterIoTDB INSTANCE = new ClusterIoTDB();
- private ClusterIoTDBHolder() {
- }
+ private ClusterIoTDBHolder() {}
}
}
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterTSServiceImpl.java
b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterTSServiceImpl.java
index c2a75fc..a0a204e 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterTSServiceImpl.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterTSServiceImpl.java
@@ -41,6 +41,7 @@ import org.apache.iotdb.db.service.TSServiceImpl;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
+
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
