[doris] branch master updated: [Bug] The PID_DIR variable in the Doris stop script does not follow the conf file (#20881)

[yi...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 37c9a08e56 [Bug] The PID_DIR variable in the Doris stop script does not follow the conf file (#20881)
37c9a08e56 is described below

commit 37c9a08e56a54de935f5d2a20223ecfd0e157415
Author: Yu Hou <52...@qq.com>
AuthorDate: Thu Jun 22 10:26:26 2023 +0800

    [Bug] The PID_DIR variable in the Doris stop script does not follow the conf file (#20881)
---
 bin/stop_be.sh | 12 ++++++++++++
 bin/stop_fe.sh | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/bin/stop_be.sh b/bin/stop_be.sh
index 513d042ff3..e3357ae371 100755
--- a/bin/stop_be.sh
+++ b/bin/stop_be.sh
@@ -32,6 +32,18 @@ PID_DIR="$(
 )"
 export PID_DIR
 
+while read -r line; do
+    envline="$(echo "${line}" |
+        sed 's/[[:blank:]]*=[[:blank:]]*/=/g' |
+        sed 's/^[[:blank:]]*//g' |
+        grep -E "^[[:upper:]]([[:upper:]]|_|[[:digit:]])*=" ||
+        true)"
+    envline="$(eval "echo ${envline}")"
+    if [[ "${envline}" == *"="* ]]; then
+        eval 'export "${envline}"'
+    fi
+done <"${DORIS_HOME}/conf/be.conf"
+
 signum=9
 if [[ "$1" = "--grace" ]]; then
     signum=15
diff --git a/bin/stop_fe.sh b/bin/stop_fe.sh
index 680486fec1..a8eb893ca2 100755
--- a/bin/stop_fe.sh
+++ b/bin/stop_fe.sh
@@ -32,6 +32,18 @@ PID_DIR="$(
 )"
 export PID_DIR
 
+while read -r line; do
+    envline="$(echo "${line}" |
+        sed 's/[[:blank:]]*=[[:blank:]]*/=/g' |
+        sed 's/^[[:blank:]]*//g' |
+        grep -E "^[[:upper:]]([[:upper:]]|_|[[:digit:]])*=" ||
+        true)"
+    envline="$(eval "echo ${envline}")"
+    if [[ "${envline}" == *"="* ]]; then
+        eval 'export "${envline}"'
+    fi
+done <"${DORIS_HOME}/conf/fe.conf"
+
 signum=9
 if [[ "$1" = "--grace" ]]; then
     signum=15


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org