CritasWang commented on code in PR #15961:
URL: https://github.com/apache/iotdb/pull/15961#discussion_r2214799891
##########
scripts/conf/windows/confignode-env.bat:
##########
@@ -121,7 +121,8 @@ set /a
MAX_CACHED_BUFFER_SIZE=%off_heap_memory_size_in_mb%/%IO_THREADS_NUMBER%*1
set CONFIGNODE_HEAP_OPTS=-Xmx%ON_HEAP_MEMORY% -Xms%ON_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-XX:MaxDirectMemorySize=%OFF_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-Djdk.nio.maxCachedBufferSize=%MAX_CACHED_BUFFER_SIZE%
-set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
+set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
+set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -Dsun.jnu.encoding=UTF-8
-Dfile.encoding=UTF-8
@REM if you want to dump the heap memory while OOM happening, you can use the
following command, remember to replace /tmp/heapdump.hprof with your own file
path and the folder where this file is located needs to be created in advance
@REM IOTDB_JMX_OPTS=%IOTDB_HEAP_OPTS% -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=\tmp\confignode_heapdump.hprof
Review Comment:
```suggestion
@REM CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=\tmp\confignode_heapdump.hprof
```
##########
scripts/conf/windows/confignode-env.bat:
##########
@@ -121,7 +121,8 @@ set /a
MAX_CACHED_BUFFER_SIZE=%off_heap_memory_size_in_mb%/%IO_THREADS_NUMBER%*1
set CONFIGNODE_HEAP_OPTS=-Xmx%ON_HEAP_MEMORY% -Xms%ON_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-XX:MaxDirectMemorySize=%OFF_HEAP_MEMORY%
set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS%
-Djdk.nio.maxCachedBufferSize=%MAX_CACHED_BUFFER_SIZE%
-set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
+set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -XX:+CrashOnOutOfMemoryError
+set CONFIGNODE_HEAP_OPTS=%CONFIGNODE_HEAP_OPTS% -Dsun.jnu.encoding=UTF-8
-Dfile.encoding=UTF-8
Review Comment:
```suggestion
```
remove this line, start-confignode.bat include this
##########
scripts/sbin/start-datanode.sh:
##########
@@ -174,19 +174,19 @@ launch_service()
iotdb_parms="$iotdb_parms -Diotdb-foreground=yes"
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH"
$IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS
Review Comment:
```suggestion
exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS $IOTDB_JVM_OPTS -cp
"$CLASSPATH" "$class" $PARAMS
```
##########
scripts/tools/windows/tsfile/overlap-statistic-tool.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -Xmx16G -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/schema/print-pb-tree-file.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/tsfile/settle-tsfile.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/wal/print-wal.bat:
##########
@@ -34,8 +34,7 @@ if NOT DEFINED JAVA_HOME goto :err
@REM
-----------------------------------------------------------------------------
@REM JVM Opts
-set JAVA_OPTS=-ea^
- -Dfile.encoding=UTF-8
+set JAVA_OPTS=-ea -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS=-ea^
-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
```
##########
scripts/conf/windows/datanode-env.bat:
##########
@@ -129,6 +129,7 @@ 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
+set IOTDB_HEAP_OPTS=%IOTDB_HEAP_OPTS% -Dsun.jnu.encoding=UTF-8
-Dfile.encoding=UTF-8
Review Comment:
```suggestion
```
remove this line, start-datanode.bat include this
##########
scripts/tools/ops/health_check.sh:
##########
@@ -372,6 +372,8 @@ system_settings_check() {
fi
}
+JVM_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
Review Comment:
```suggestion
```
unused, remove this line
##########
scripts/sbin/start-datanode.sh:
##########
@@ -174,19 +174,19 @@ launch_service()
iotdb_parms="$iotdb_parms -Diotdb-foreground=yes"
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH"
$IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS
else
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS $illegal_access_params
$iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class" $PARAMS
Review Comment:
```suggestion
exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS $IOTDB_JVM_OPTS -cp "$CLASSPATH" "$class" $PARAMS
```
##########
scripts/tools/windows/schema/print-schema-log.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/sbin/start-datanode.sh:
##########
@@ -174,19 +174,19 @@ launch_service()
iotdb_parms="$iotdb_parms -Diotdb-foreground=yes"
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH"
$IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS
else
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS $illegal_access_params
$iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class" $PARAMS
fi
# Startup IoTDB, background it, and write the pid.
else
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
- exec $NUMACTL "$JAVA" $JVM_OPTS
"$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS 2>&1 >
/dev/null <&- &
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS 2>&1 > /dev/null <&- &
Review Comment:
```suggestion
exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS $IOTDB_JVM_OPTS -cp
"$CLASSPATH" "$class" $PARAMS 2>&1 > /dev/null <&- &
```
##########
scripts/tools/windows/tsfile/print-tsfile-resource-files.bat:
##########
@@ -44,8 +44,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/tsfile/check-overlap-sequence-files-and-repair.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/sbin/start-datanode.sh:
##########
@@ -174,19 +174,19 @@ launch_service()
iotdb_parms="$iotdb_parms -Diotdb-foreground=yes"
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH"
$IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS
else
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
- exec $NUMACTL "$JAVA" $JVM_OPTS $illegal_access_params
$iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS
+ exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class" $PARAMS
fi
# Startup IoTDB, background it, and write the pid.
else
if [ "x$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" != "x" ]; then
- exec $NUMACTL "$JAVA" $JVM_OPTS
"$JVM_ON_OUT_OF_MEMORY_ERROR_OPT" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS 2>&1 >
/dev/null <&- &
+ exec $NUMACTL "$JAVA" "$JVM_ON_OUT_OF_MEMORY_ERROR_OPT"
$illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class"
$PARAMS 2>&1 > /dev/null <&- &
[ ! -z "$pidfile" ] && printf "%d" $! > "$pidfile"
true
else
- exec $NUMACTL "$JAVA" $JVM_OPTS $illegal_access_params
$iotdb_parms $IOTDB_JMX_OPTS -cp "$CLASSPATH" $IOTDB_JVM_OPTS "$class" $PARAMS
2>&1 > /dev/null <&- &
+ exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS -cp "$CLASSPATH" "$class" $PARAMS 2>&1 > /dev/null <&- &
Review Comment:
```suggestion
exec $NUMACTL "$JAVA" $illegal_access_params $iotdb_parms
$IOTDB_JMX_OPTS $IOTDB_JVM_OPTS -cp "$CLASSPATH" "$class" $PARAMS 2>&1 >
/dev/null <&- &
```
##########
scripts/tools/windows/tsfile/validate-tsfile.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/tsfile/print-iotdb-data-dir.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%"
"-Dlogback.configurationFile=%IOTDB_HOME%\conf\logback-tool.xml" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
##########
scripts/tools/windows/tsfile/split-tsfile-tool.bat:
##########
@@ -45,8 +45,8 @@ goto :eof
@REM
-----------------------------------------------------------------------------
:okClasspath
-
-"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" %MAIN_CLASS% %*
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8
Review Comment:
```suggestion
set JAVA_OPTS="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]