You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/06/12 11:10:33 UTC

[iotdb] 01/02: fix jvm

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

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

commit b907d7abdc3adcc4cbfcd46d8fafb7dfe590b389
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jun 12 18:37:34 2023 +0800

    fix jvm
---
 .../src/assembly/resources/sbin/iotdb-common.sh        | 18 ++++++++++++++++++
 standalone/src/assembly/resources/sbin/start-iotdb.sh  |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/node-commons/src/assembly/resources/sbin/iotdb-common.sh b/node-commons/src/assembly/resources/sbin/iotdb-common.sh
index 3d99851e2cf..59d08c48bd1 100755
--- a/node-commons/src/assembly/resources/sbin/iotdb-common.sh
+++ b/node-commons/src/assembly/resources/sbin/iotdb-common.sh
@@ -323,6 +323,24 @@ initConfigNodeEnv() {
   fi
 }
 
+initStandaloneEnv() {
+  if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then
+      if [ "x$PRINT_GC" != "x" ]; then
+        . "$IOTDB_CONF/iotdb-env.sh" "printgc"
+      else
+          . "$IOTDB_CONF/iotdb-env.sh"
+      fi
+  elif [ -f "${IOTDB_HOME}/conf/iotdb-env.sh" ]; then
+      if [ "x$PRINT_GC" != "x" ]; then
+        . "${IOTDB_HOME}/conf/iotdb-env.sh" "printgc"
+      else
+        . "${IOTDB_HOME}/conf/iotdb-env.sh"
+      fi
+  else
+      echo "Can't find $IOTDB_CONF/iotdb-env.sh"
+  fi
+}
+
 get_iotdb_include() {
   #reset $1 to $* for this command
   eval set -- "$1"
diff --git a/standalone/src/assembly/resources/sbin/start-iotdb.sh b/standalone/src/assembly/resources/sbin/start-iotdb.sh
index 85ea361a783..091fe9a0b25 100644
--- a/standalone/src/assembly/resources/sbin/start-iotdb.sh
+++ b/standalone/src/assembly/resources/sbin/start-iotdb.sh
@@ -124,7 +124,7 @@ checkDataNodePortUsages
 PARAMS="-s $PARAMS"
 
 #initEnv is in iotdb-common.sh
-initEnv
+initStandaloneEnv
 
 
 CLASSPATH=""
@@ -143,7 +143,7 @@ launch_service() {
   	iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
     iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
   	iotdb_parms="$iotdb_parms -DCONFIGNODE_CONF=${IOTDB_CONF}"
-  	iotdb_parms="$iotdb_parms -DTSFILE_CONF=${IOTDB_HOME}"
+  	iotdb_parms="$iotdb_parms -DTSFILE_CONF=${IOTDB_CONF}"
   	iotdb_parms="$iotdb_parms -Dname=iotdb\.IoTDB"
     iotdb_parms="$iotdb_parms -DIOTDB_LOG_DIR=${IOTDB_LOG_DIR}"
   	iotdb_parms="$iotdb_parms -DCONFIGNODE_LOGS=${IOTDB_LOG_DIR}"