[SR-4389] make STARROCKS_HOME compatible with DORIS_HOME in configura…

…tion and startup be/fe. (StarRocks#27) make STARROCKS_HOME compatible with DORIS_HOME, since the configuration can not be changed on user side.
luoyuxia · Sep 7, 2021 · 5b739eb · 5b739eb
1 parent c7256b7
commit 5b739eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/bin/start_be.sh b/bin/start_be.sh
@@ -37,6 +37,8 @@ while true; do
 done
 
 export STARROCKS_HOME=`cd "$curdir/.."; pwd`
+# compatible with DORIS_HOME: DORIS_HOME still be using in config on the user side, so set DORIS_HOME to the meaningful value in case of wrong envs.
+export DORIS_HOME="$STARROCKS_HOME"
 source $STARROCKS_HOME/bin/common.sh
 
 # export env variables from be.conf

diff --git a/bin/start_fe.sh b/bin/start_fe.sh
@@ -41,6 +41,9 @@ done
 
 export STARROCKS_HOME=`cd "$curdir/.."; pwd`
 
+# compatible with DORIS_HOME: DORIS_HOME still be using in config on the user side, so set DORIS_HOME to the meaningful value in case of wrong envs.
+export DORIS_HOME="$STARROCKS_HOME"
+
 source $STARROCKS_HOME/bin/common.sh
 
 # export env variables from fe.conf

diff --git a/bin/stop_be.sh b/bin/stop_be.sh
@@ -20,6 +20,8 @@ curdir=`dirname "$0"`
 curdir=`cd "$curdir"; pwd`
 
 export STARROCKS_HOME=`cd "$curdir/.."; pwd`
+# compatible with DORIS_HOME: DORIS_HOME still be using in config on the user side, so set DORIS_HOME to the meaningful value in case of wrong envs.
+export DORIS_HOME="$STARROCKS_HOME"
 export PID_DIR=`cd "$curdir"; pwd`
 
 source $STARROCKS_HOME/bin/common.sh

diff --git a/bin/stop_fe.sh b/bin/stop_fe.sh
@@ -20,6 +20,8 @@ curdir=`dirname "$0"`
 curdir=`cd "$curdir"; pwd`
 
 export STARROCKS_HOME=`cd "$curdir/.."; pwd`
+# compatible with DORIS_HOME: DORIS_HOME still be using in config on the user side, so set DORIS_HOME to the meaningful value in case of wrong envs.
+export DORIS_HOME="$STARROCKS_HOME"
 export PID_DIR=`cd "$curdir"; pwd`
 
 source $STARROCKS_HOME/bin/common.sh