This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 7d159cd775c [opt](cloud) Remove patchelf in start.sh for meta-service
(#42299)
7d159cd775c is described below
commit 7d159cd775c2ee39a12969bae178e9fea6581b90
Author: Gavin Chou <[email protected]>
AuthorDate: Thu Oct 24 13:38:38 2024 +0800
[opt](cloud) Remove patchelf in start.sh for meta-service (#42299)
`patchelf` is not always available in all runtime environments, remove
it from start script for ms.
---
cloud/script/start.sh | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/cloud/script/start.sh b/cloud/script/start.sh
index 582c80c2e6f..1b1a4a87e53 100644
--- a/cloud/script/start.sh
+++ b/cloud/script/start.sh
@@ -62,7 +62,7 @@ done <"${DORIS_HOME}/conf/doris_cloud.conf"
process=doris_cloud
-if [[ -f "${DORIS_HOME}/bin/${process}.pid" ]]; then
+if [[ ${RUN_VERSION} -eq 0 ]] && [[ -f "${DORIS_HOME}/bin/${process}.pid" ]];
then
pid=$(cat "${DORIS_HOME}/bin/${process}.pid")
if [[ "${pid}" != "" ]]; then
if kill -0 "$(cat "${DORIS_HOME}/bin/${process}.pid")" >/dev/null
2>&1; then
@@ -76,14 +76,7 @@ fi
lib_path="${DORIS_HOME}/lib"
bin="${DORIS_HOME}/lib/doris_cloud"
-if ldd "${bin}" | grep -Ei 'libfdb_c.*not found' &>/dev/null; then
- if ! command -v patchelf &>/dev/null; then
- echo "patchelf is needed to launch meta_service"
- exit 1
- fi
- patchelf --set-rpath "${lib_path}" "${bin}"
- # ldd "${bin}"
-fi
+export LD_LIBRARY_PATH="${lib_path}:${LD_LIBRARY_PATH}"
chmod 550 "${DORIS_HOME}/lib/doris_cloud"
@@ -127,7 +120,7 @@ echo "LIBHDFS3_CONF=${LIBHDFS3_CONF}"
# to control the dump path, change `prof_prefix` to a specific path, e.g.
/doris_cloud/log/ms_, by default it dumps at the path where the start command
called
export
JEMALLOC_CONF="percpu_arena:percpu,background_thread:true,metadata_thp:auto,muzzy_decay_ms:5000,dirty_decay_ms:5000,oversize_threshold:0,prof_prefix:ms_,prof:false,lg_prof_interval:34"
-if [[ "${RUN_VERSION}" -eq 1 ]]; then
+if [[ "${RUN_VERSION}" -ne 0 ]]; then
"${bin}" --version
exit 0
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
