(iotdb) branch master updated: fix start-confignode.sh, Support -H (#12878)

[haonan]

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

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new cbfaca67690 fix start-confignode.sh, Support -H (#12878)
cbfaca67690 is described below

commit cbfaca6769056b10d08e432c64053ebe2821dde7
Author: CritasWang <cri...@outlook.com>
AuthorDate: Tue Jul 9 11:58:00 2024 +0800

    fix start-confignode.sh, Support -H (#12878)
    
    * fix start-confignode.sh, Support -H
    
    * Require 8u92 or higher version
---
 iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh | 6 +++---
 .../confignode/src/assembly/resources/sbin/start-confignode.sh      | 1 +
 iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh     | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh 
b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
index 6e58fe3633f..2e89a6f0d7f 100644
--- a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
+++ b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
@@ -172,12 +172,12 @@ jvmver=`echo "$java_ver_output" | grep '[openjdk|java] 
version' | awk -F'"' 'NR=
 JVM_VERSION=${jvmver%_*}
 JVM_PATCH_VERSION=${jvmver#*_}
 if [ "$JVM_VERSION" \< "1.8" ] ; then
-    echo "IoTDB requires Java 8u40 or later."
+    echo "IoTDB requires Java 8u92 or later."
     exit 1;
 fi
 
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then
-    echo "IoTDB requires Java 8u40 or later."
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 92 ] ; then
+    echo "IoTDB requires Java 8u92 or later."
     exit 1;
 fi
 
diff --git 
a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh 
b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
index 848eab14df6..130810578ec 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
@@ -120,6 +120,7 @@ PARAMS="-s $PARAMS"
 #initEnv is in iotdb-common.sh
 initConfigNodeEnv
 
+CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS $IOTDB_HEAP_DUMP_COMMAND"
 
 CLASSPATH=""
 for f in "${CONFIGNODE_HOME}"/lib/*.jar; do
diff --git a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh 
b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
index 2f71ff6e1ac..ac637869a6b 100755
--- a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
+++ b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
@@ -166,12 +166,12 @@ jvmver=`echo "$java_ver_output" | grep '[openjdk|java] 
version' | awk -F'"' 'NR=
 JVM_VERSION=${jvmver%_*}
 JVM_PATCH_VERSION=${jvmver#*_}
 if [ "$JVM_VERSION" \< "1.8" ] ; then
-    echo "IoTDB requires Java 8u40 or later."
+    echo "IoTDB requires Java 8u92 or later."
     exit 1;
 fi
 
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 40 ] ; then
-    echo "IoTDB requires Java 8u40 or later."
+if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt 92 ] ; then
+    echo "IoTDB requires Java 8u92 or later."
     exit 1;
 fi