Skip to content

[chore](cloud) Improve cloud start stop script: wait for quit synchronously #40218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Sep 3, 2024
Merged

[chore](cloud) Improve cloud start stop script: wait for quit synchronously #40218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloud/script/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if ldd "${bin}" | grep -Ei 'libfdb_c.*not found' &>/dev/null; then
exit 1
fi
patchelf --set-rpath "${lib_path}" "${bin}"
ldd "${bin}"
# ldd "${bin}"
fi

chmod 550 "${DORIS_HOME}/lib/doris_cloud"
Expand All @@ -91,7 +91,7 @@ if [[ -z "${JAVA_HOME}" ]]; then
echo "The JAVA_HOME environment variable is not defined correctly"
echo "This environment variable is needed to run this program"
echo "NB: JAVA_HOME should point to a JDK not a JRE"
echo "You can set it in be.conf"
echo "You can set it in doris_cloud.conf"
exit 1
fi

Expand Down
13 changes: 13 additions & 0 deletions cloud/script/stop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,17 @@ fi

pid=$(cat "${DORIS_HOME}/bin/${process}.pid")
kill -2 "${pid}"
cnt=0
while true; do
cnt=$((cnt + 1))
echo "waiting ${pid} to quit, ${cnt} seconds elapsed"
msg=$(ps "${pid}")
ret=$?
if [[ ${ret} -ne 0 ]]; then
echo "${pid} has quit"
break
fi
echo "${msg}"
sleep 1
done
rm -f "${DORIS_HOME}/bin/${process}.pid"