diff --git a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat index 1b19922b208f..d854965b4ec4 100644 --- a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat +++ b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.bat @@ -59,7 +59,7 @@ set JAVA_OPTS=-ea^ @REM ***** CLASSPATH library setting ***** @REM Ensure that any user defined CLASSPATH variables are not used on startup -if EXIST %IOTDB_HOME%\lib (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" +if EXIST "%IOTDB_HOME%\lib" (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" goto okClasspath :append diff --git a/iotdb-client/cli/src/assembly/resources/tools/backup.bat b/iotdb-client/cli/src/assembly/resources/tools/backup.bat index b5d875c1fe25..4037f5d3ff37 100644 --- a/iotdb-client/cli/src/assembly/resources/tools/backup.bat +++ b/iotdb-client/cli/src/assembly/resources/tools/backup.bat @@ -29,7 +29,7 @@ popd if NOT DEFINED JAVA_HOME goto :err set JAVA_OPTS=-ea^ - -DIOTDB_HOME=%IOTDB_HOME% + -DIOTDB_HOME="%IOTDB_HOME%" SET IOTDB_CONF=%IOTDB_HOME%\conf IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( @@ -40,7 +40,7 @@ IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_rpc_port=%%i ) ) ELSE ( @@ -49,7 +49,7 @@ IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" ( IF EXIST "%IOTDB_CONF%\iotdb-confignode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_internal_port" - %IOTDB_CONF%\iotdb-confignode.properties') do ( + "%IOTDB_CONF%\iotdb-confignode.properties"') do ( set cn_internal_port=%%i ) ) ELSE ( @@ -91,10 +91,10 @@ echo ------------------------------------------ echo Starting IoTDB Client Data Back Script echo ------------------------------------------ -set CLASSPATH=%CLASSPATH%;%IOTDB_HOME%\lib\* +set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*" if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.IoTDBDataBackTool -set "logsDir=%IOTDB_HOME%\logs" +set logsDir="%IOTDB_HOME%\logs" if not exist "%logsDir%" ( mkdir "%logsDir%" ) diff --git a/iotdb-client/cli/src/assembly/resources/tools/export-data.bat b/iotdb-client/cli/src/assembly/resources/tools/export-data.bat index fe35bfc215ea..c3acfff5f92e 100644 --- a/iotdb-client/cli/src/assembly/resources/tools/export-data.bat +++ b/iotdb-client/cli/src/assembly/resources/tools/export-data.bat @@ -37,14 +37,14 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_HOME=%IOTDB_HOME% + -DIOTDB_HOME="%IOTDB_HOME%" @REM ***** CLASSPATH library setting ***** -set CLASSPATH=%CLASSPATH%;%IOTDB_HOME%\lib\* +set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*" REM ----------------------------------------------------------------------------- -"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* +"%JAVA_HOME%\bin\java" -DIOTDB_HOME="%IOTDB_HOME%" %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* set ret_code=%ERRORLEVEL% goto finally diff --git a/iotdb-client/cli/src/assembly/resources/tools/export-tsfile.bat b/iotdb-client/cli/src/assembly/resources/tools/export-tsfile.bat index 195cb32be8f5..350e806a7695 100644 --- a/iotdb-client/cli/src/assembly/resources/tools/export-tsfile.bat +++ b/iotdb-client/cli/src/assembly/resources/tools/export-tsfile.bat @@ -37,14 +37,14 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_HOME=%IOTDB_HOME% + -DIOTDB_HOME="%IOTDB_HOME%" @REM ***** CLASSPATH library setting ***** -set CLASSPATH=%CLASSPATH%;%IOTDB_HOME%\lib\* +set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*" REM ----------------------------------------------------------------------------- -"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* +"%JAVA_HOME%\bin\java" -DIOTDB_HOME="%IOTDB_HOME%" %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* set ret_code=%ERRORLEVEL% goto finally diff --git a/iotdb-client/cli/src/assembly/resources/tools/import-data.bat b/iotdb-client/cli/src/assembly/resources/tools/import-data.bat index d4270297c93f..cb34c5e897a6 100644 --- a/iotdb-client/cli/src/assembly/resources/tools/import-data.bat +++ b/iotdb-client/cli/src/assembly/resources/tools/import-data.bat @@ -37,14 +37,14 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_HOME=%IOTDB_HOME% + -DIOTDB_HOME="%IOTDB_HOME%" @REM ***** CLASSPATH library setting ***** -set CLASSPATH=%CLASSPATH%;%IOTDB_HOME%\lib\* +set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*" REM ----------------------------------------------------------------------------- -"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* +"%JAVA_HOME%\bin\java" -DIOTDB_HOME="%IOTDB_HOME%" %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* set ret_code=%ERRORLEVEL% goto finally diff --git a/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.bat b/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.bat index 006551a615a0..3dc5553ef52b 100644 --- a/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.bat +++ b/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.bat @@ -39,7 +39,7 @@ set JAVA_OPTS=-ea^ -DIOTDB_HOME="%IOTDB_HOME%" REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable. -if EXIST %IOTDB_HOME%\lib (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" +if EXIST "%IOTDB_HOME%\lib" (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" REM ----------------------------------------------------------------------------- diff --git a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.bat b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.bat index f0e0b95d7393..d270c08f54ef 100644 --- a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.bat +++ b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.bat @@ -40,8 +40,8 @@ if %JMX_LOCAL% == "false" ( -Djava.rmi.server.randomIDs=true^ -Dcom.sun.management.jmxremote.ssl=false^ -Dcom.sun.management.jmxremote.authenticate=false^ - -Dcom.sun.management.jmxremote.password.file=%CONFIGNODE_CONF%\jmx.password^ - -Dcom.sun.management.jmxremote.access.file=%CONFIGNODE_CONF%\jmx.access^ + -Dcom.sun.management.jmxremote.password.file="%CONFIGNODE_CONF%\jmx.password"^ + -Dcom.sun.management.jmxremote.access.file="%CONFIGNODE_CONF%\jmx.access"^ -Djava.rmi.server.hostname=%JMX_IP% ) else ( echo "setting local JMX..." @@ -59,9 +59,9 @@ for /f %%b in ('wmic ComputerSystem get TotalPhysicalMemory ^| findstr "[0-9]"' set system_memory=%%b ) -echo wsh.echo FormatNumber(cdbl(%system_memory%)/(1024*1024), 0) > %CONFIGNODE_HOME%\sbin\tmp.vbs -for /f "tokens=*" %%a in ('cscript //nologo %CONFIGNODE_HOME%\sbin\tmp.vbs') do set system_memory_in_mb=%%a -del %CONFIGNODE_HOME%\sbin\tmp.vbs +echo wsh.echo FormatNumber(cdbl(%system_memory%)/(1024*1024), 0) > "%CONFIGNODE_HOME%\sbin\tmp.vbs" +for /f "tokens=*" %%a in ('cscript //nologo "%CONFIGNODE_HOME%\sbin\tmp.vbs"') do set system_memory_in_mb=%%a +del "%CONFIGNODE_HOME%\sbin\tmp.vbs" set system_memory_in_mb=%system_memory_in_mb:,=% @REM suggest using memory, system memory 3 / 10 @@ -132,10 +132,10 @@ set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError @REM set gc log. IF "%1" equ "printgc" ( IF "%JAVA_VERSION%" == "8" ( - md %CONFIGNODE_HOME%\logs + md "%CONFIGNODE_HOME%\logs" set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -Xloggc:"%CONFIGNODE_HOME%\logs\gc.log" -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCApplicationStoppedTime -XX:+PrintPromotionFailure -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M ) ELSE ( - md %CONFIGNODE_HOME%\logs + md "%CONFIGNODE_HOME%\logs" set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -Xlog:gc=info,heap*=trace,age*=debug,safepoint=info,promotion*=trace:file="%CONFIGNODE_HOME%\logs\gc.log":time,uptime,pid,tid,level:filecount=10,filesize=10485760 ) ) diff --git a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat b/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat index 67a78e1114b9..145302cd11f9 100644 --- a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat +++ b/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat @@ -95,7 +95,7 @@ set JAVA_OPTS=-ea^ @REM ***** CLASSPATH library setting ***** @REM Ensure that any user defined CLASSPATH variables are not used on startup -if EXIST %CONFIGNODE_HOME%\lib (set CLASSPATH="%CONFIGNODE_HOME%\lib\*") else set CLASSPATH="%CONFIGNODE_HOME%\..\lib\*" +if EXIST "%CONFIGNODE_HOME%\lib" (set CLASSPATH="%CONFIGNODE_HOME%\lib\*") else set CLASSPATH="%CONFIGNODE_HOME%\..\lib\*" set CLASSPATH=%CLASSPATH%;iotdb.ConfigNode goto okClasspath diff --git a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat index cc733ba9d549..532c79933051 100644 --- a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat +++ b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat @@ -85,20 +85,20 @@ IF EXIST "%CONFIGNODE_CONF%\confignode-env.bat" ( @REM CHECK THE PORT USAGES IF EXIST "%CONFIGNODE_CONF%\iotdb-confignode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_internal_port" - %CONFIGNODE_CONF%\iotdb-confignode.properties') do ( + "%CONFIGNODE_CONF%\iotdb-confignode.properties"') do ( set cn_internal_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_consensus_port" - %CONFIGNODE_CONF%\iotdb-confignode.properties') do ( + "%CONFIGNODE_CONF%\iotdb-confignode.properties"') do ( set cn_consensus_port=%%i ) ) ELSE IF EXIST "%CONFIGNODE_HOME%\conf\iotdb-confignode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_internal_port" - %CONFIGNODE_HOME%\conf\iotdb-confignode.properties') do ( + "%CONFIGNODE_HOME%\conf\iotdb-confignode.properties"') do ( set cn_internal_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_consensus_port" - %CONFIGNODE_HOME%\conf\iotdb-confignode.properties') do ( + "%CONFIGNODE_HOME%\conf\iotdb-confignode.properties"') do ( set cn_consensus_port=%%i ) ) ELSE ( @@ -150,7 +150,7 @@ set JAVA_OPTS=-ea^ @REM ***** CLASSPATH library setting ***** @REM Ensure that any user defined CLASSPATH variables are not used on startup -if EXIST %CONFIGNODE_HOME%\lib (set CLASSPATH="%CONFIGNODE_HOME%\lib\*") else set CLASSPATH="%CONFIGNODE_HOME%\..\lib\*" +if EXIST "%CONFIGNODE_HOME%\lib" (set CLASSPATH="%CONFIGNODE_HOME%\lib\*") else set CLASSPATH="%CONFIGNODE_HOME%\..\lib\*" set CLASSPATH=%CLASSPATH%;iotdb.ConfigNode goto okClasspath diff --git a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat index adfc0ef49fae..c82a095ec1fa 100644 --- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat +++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat @@ -23,14 +23,14 @@ set current_dir=%~dp0 set superior_dir=%current_dir%\..\ for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "^cn_internal_port" -%superior_dir%\conf\iotdb-confignode.properties') do ( +"%superior_dir%\conf\iotdb-confignode.properties"') do ( set cn_internal_port=%%i ) echo "check whether the cn_internal_port is used..., port is %cn_internal_port%" for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "cn_internal_address" -%superior_dir%\conf\iotdb-confignode.properties') do ( +"%superior_dir%\conf\iotdb-confignode.properties"') do ( set cn_internal_address=%%i ) diff --git a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.bat b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.bat index 834db766b2f3..16921072dba3 100644 --- a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.bat +++ b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.bat @@ -40,8 +40,8 @@ if %JMX_LOCAL% == "false" ( -Djava.rmi.server.randomIDs=true^ -Dcom.sun.management.jmxremote.ssl=false^ -Dcom.sun.management.jmxremote.authenticate=false^ - -Dcom.sun.management.jmxremote.password.file=%IOTDB_CONF%\jmx.password^ - -Dcom.sun.management.jmxremote.access.file=%IOTDB_CONF%\jmx.access^ + -Dcom.sun.management.jmxremote.password.file="%IOTDB_CONF%\jmx.password"^ + -Dcom.sun.management.jmxremote.access.file="%IOTDB_CONF%\jmx.acces"s^ -Djava.rmi.server.hostname=%JMX_IP% ) else ( echo "setting local JMX..." @@ -59,9 +59,9 @@ for /f %%b in ('wmic ComputerSystem get TotalPhysicalMemory ^| findstr "[0-9]"' set system_memory=%%b ) -echo wsh.echo FormatNumber(cdbl(%system_memory%)/(1024*1024), 0) > %IOTDB_HOME%\sbin\tmp.vbs -for /f "tokens=*" %%a in ('cscript //nologo %IOTDB_HOME%\sbin\tmp.vbs') do set system_memory_in_mb=%%a -del %IOTDB_HOME%\sbin\tmp.vbs +echo wsh.echo FormatNumber(cdbl(%system_memory%)/(1024*1024), 0) > "%IOTDB_HOME%\sbin\tmp.vbs" +for /f "tokens=*" %%a in ('cscript //nologo "%IOTDB_HOME%\sbin\tmp.vbs"') do set system_memory_in_mb=%%a +del "%IOTDB_HOME%\sbin\tmp.vbs" set system_memory_in_mb=%system_memory_in_mb:,=% set /a suggest_=%system_memory_in_mb%/2 @@ -123,6 +123,9 @@ set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -Djdk.nio.maxCachedBufferSize=%MAX_CACHED_ set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+UseAdaptiveSizePolicy set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -Xss512k +@REM options below try to optimize safepoint stw time. +set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+UnlockDiagnosticVMOptions +set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:GuaranteedSafepointInterval=0 @REM these two options print safepoints with pauses longer than 1000ms to the standard output. You can see these logs via redirection when starting in the background like "start-datanode.sh > log_datanode_safepoint.txt" set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:SafepointTimeoutDelay=1000 set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+SafepointTimeout @@ -154,13 +157,13 @@ set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+SafepointTimeout @REM set gc log. IF "%1" equ "printgc" ( IF "%JAVA_VERSION%" == "8" ( - md %IOTDB_HOME%\logs + md "%IOTDB_HOME%\logs" set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -Xloggc:"%IOTDB_HOME%\logs\gc.log" -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCApplicationStoppedTime -XX:+PrintPromotionFailure -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M @REM For more detailed GC information, you can uncomment option below. @REM NOTE: more detailed GC information may bring larger GC log files. @REM set IOTDB_JMX_OPTS=%IOTDB_JMX_OPTS% -Xloggc:"%IOTDB_HOME%\logs\gc.log" -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintGCApplicationStoppedTime -XX:+PrintPromotionFailure -XX:+UseGCLogFileRotation -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC -XX:+PrintReferenceGC -XX:+PrintSafepointStatistics -XX:PrintSafepointStatisticsCount=1 -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M ) ELSE ( - md %IOTDB_HOME%\logs + md "%IOTDB_HOME%\logs" set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -Xlog:gc=info,heap*=trace,age*=debug,safepoint=info,promotion*=trace:file="%IOTDB_HOME%\logs\gc.log":time,uptime,pid,tid,level:filecount=10,filesize=10485760 @REM For more detailed GC information, you can uncomment option below. @REM NOTE: more detailed GC information may bring larger GC log files. diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat b/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat index 083624b0fd82..0873026d11f5 100644 --- a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat +++ b/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat @@ -77,7 +77,7 @@ set JAVA_OPTS=-ea^ @REM ***** CLASSPATH library setting ***** @REM Ensure that any user defined CLASSPATH variables are not used on startup -if EXIST %IOTDB_HOME%\lib (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" +if EXIST "%IOTDB_HOME%\lib" (set CLASSPATH="%IOTDB_HOME%\lib\*") else 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\*" diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat index 6cae272f365a..12890113dfe4 100755 --- a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat +++ b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat @@ -72,16 +72,20 @@ IF "%1" == "printgc" ( SHIFT ) +SET IOTDB_CONF=%IOTDB_HOME%\conf +SET IOTDB_LOGS=%IOTDB_HOME%\logs + @setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS -SET IOTDB_CONF=%1 -IF "%IOTDB_CONF%" == "" ( - SET IOTDB_CONF=%IOTDB_HOME%\conf -) ELSE ( - SET IOTDB_CONF="%IOTDB_CONF%" +set is_conf_path=false +for %%i in (%*) do ( + IF "%%i" == "-c" ( + set is_conf_path=true + ) ELSE IF "!is_conf_path!" == "true" ( + set is_conf_path=false + set IOTDB_CONF=%%i + ) ) -SET IOTDB_LOGS=%IOTDB_HOME%\logs - IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( IF "%enable_printgc%" == "true" ( CALL "%IOTDB_CONF%\datanode-env.bat" printgc @@ -101,44 +105,44 @@ IF EXIST "%IOTDB_CONF%\datanode-env.bat" ( @REM CHECK THE PORT USAGES IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_rpc_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_internal_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_internal_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_mpp_data_exchange_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_mpp_data_exchange_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_schema_region_consensus_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_schema_region_consensus_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_data_region_consensus_port" - %IOTDB_CONF%\iotdb-datanode.properties') do ( + "%IOTDB_CONF%\iotdb-datanode.properties"') do ( set dn_data_region_consensus_port=%%i ) ) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-datanode.properties" ( for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port" - %IOTDB_HOME%\conf\iotdb-datanode.properties') do ( + "%IOTDB_HOME%\conf\iotdb-datanode.properties"') do ( set dn_rpc_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_internal_port" - %IOTDB_HOME%\conf\iotdb-datanode.properties') do ( + "%IOTDB_HOME%\conf\iotdb-datanode.properties"') do ( set dn_internal_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_mpp_data_exchange_port" - %IOTDB_HOME%\conf\iotdb-datanode.properties') do ( + "%IOTDB_HOME%\conf\iotdb-datanode.properties"') do ( set dn_mpp_data_exchange_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_schema_region_consensus_port" - %IOTDB_HOME%\conf\iotdb-datanode.properties') do ( + "%IOTDB_HOME%\conf\iotdb-datanode.properties"') do ( set dn_schema_region_consensus_port=%%i ) for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_data_region_consensus_port" - %IOTDB_HOME%\conf\iotdb-datanode.properties') do ( + "%IOTDB_HOME%\conf\iotdb-datanode.properties"') do ( set dn_data_region_consensus_port=%%i ) ) ELSE ( @@ -217,7 +221,7 @@ set JAVA_OPTS=-ea^ @REM ---------------------------------------------------------------------------- @REM ***** CLASSPATH library setting ***** @REM Ensure that any user defined CLASSPATH variables are not used on startup -if EXIST %IOTDB_HOME%\lib (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" +if EXIST "%IOTDB_HOME%\lib" (set CLASSPATH="%IOTDB_HOME%\lib\*") else set CLASSPATH="%IOTDB_HOME%\..\lib\*" @REM this special suffix 'iotdb.DataNode' is mandatory as stop-node.bat uses it to filter the process id. set CLASSPATH=%CLASSPATH%;iotdb.DataNode diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat index 11dea977afc8..2197251570e5 100644 --- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat +++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat @@ -23,14 +23,14 @@ set current_dir=%~dp0 set superior_dir=%current_dir%\..\ for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port" -%superior_dir%\conf\iotdb-datanode.properties') do ( +"%superior_dir%\conf\iotdb-datanode.properties"') do ( set dn_rpc_port=%%i ) echo Check whether the rpc_port is used..., port is %dn_rpc_port% for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "dn_rpc_address" -%superior_dir%\conf\iotdb-datanode.properties') do ( +"%superior_dir%\conf\iotdb-datanode.properties"') do ( set dn_rpc_address=%%i ) diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat index c25485b38b86..36691cff4095 100644 --- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat +++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat @@ -35,7 +35,7 @@ if not "%CLEAN_SERVICE%"=="y" if not "%CLEAN_SERVICE%"=="Y" ( start cmd /c "%IOTDB_HOME%\\sbin\\stop-confignode.bat -f" timeout /t 3 > nul rmdir /s /q "%IOTDB_HOME%\data\confignode\" 2>nul -set IOTDB_CONFIGNODE_CONFIG=%IOTDB_HOME%\conf\iotdb-confignode.properties +set IOTDB_CONFIGNODE_CONFIG="%IOTDB_HOME%\conf\iotdb-confignode.properties" set "delimiter=,;" for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_system_dir" %IOTDB_CONFIGNODE_CONFIG%') do ( diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat index 744fb09a9533..1ccf0346f504 100644 --- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat +++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat @@ -34,7 +34,7 @@ if not "%CLEAN_SERVICE%"=="y" if not "%CLEAN_SERVICE%"=="Y" ( start cmd /c "%IOTDB_HOME%\\sbin\\stop-datanode.bat -f" timeout /t 3 > nul rmdir /s /q "%IOTDB_HOME%\data\datanode\" 2>nul -set IOTDB_DATANODE_CONFIG=%IOTDB_HOME%\conf\iotdb-datanode.properties +set IOTDB_DATANODE_CONFIG="%IOTDB_HOME%\conf\iotdb-datanode.properties" set "delimiter=,;" for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_system_dir" %IOTDB_DATANODE_CONFIG%') do ( diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/start-standalone.bat b/iotdb-core/node-commons/src/assembly/resources/sbin/start-standalone.bat index 4a10d54f6bb4..5bddfe8d5812 100644 --- a/iotdb-core/node-commons/src/assembly/resources/sbin/start-standalone.bat +++ b/iotdb-core/node-commons/src/assembly/resources/sbin/start-standalone.bat @@ -24,14 +24,14 @@ if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd% popd IF EXIST "%IOTDB_HOME%\sbin\start-confignode.bat" ( - SET CONFIGNODE_START_PATH=%IOTDB_HOME%\sbin\start-confignode.bat + SET CONFIGNODE_START_PATH="%IOTDB_HOME%\sbin\start-confignode.bat" ) ELSE ( echo "Can't find start-confignode.bat." exit 0 ) IF EXIST "%IOTDB_HOME%\sbin\start-datanode.bat" ( - SET DATANODE_START_PATH=%IOTDB_HOME%\sbin\start-datanode.bat + SET DATANODE_START_PATH="%IOTDB_HOME%\sbin\start-datanode.bat" ) ELSE ( echo "Can't find start-datanode.bat." exit 0 diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/stop-standalone.bat b/iotdb-core/node-commons/src/assembly/resources/sbin/stop-standalone.bat index ef53980fae6c..8c4de181bd0c 100644 --- a/iotdb-core/node-commons/src/assembly/resources/sbin/stop-standalone.bat +++ b/iotdb-core/node-commons/src/assembly/resources/sbin/stop-standalone.bat @@ -24,14 +24,14 @@ if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd% popd IF EXIST "%IOTDB_HOME%\sbin\stop-confignode.bat" ( - SET CONFIGNODE_STOP_PATH=%IOTDB_HOME%\sbin\stop-confignode.bat + SET CONFIGNODE_STOP_PATH="%IOTDB_HOME%\sbin\stop-confignode.bat" ) ELSE ( echo "Can't find stop-confignode.bat." exit 0 ) IF EXIST "%IOTDB_HOME%\sbin\stop-datanode.bat" ( - SET DATANODE_STOP_PATH=%IOTDB_HOME%\sbin\stop-datanode.bat + SET DATANODE_STOP_PATH="%IOTDB_HOME%\sbin\stop-datanode.bat" ) ELSE ( echo "Can't find stop-datanode.bat." exit 0