From a4bf26a891c41f3b2463bb45c8b943872e74f58a Mon Sep 17 00:00:00 2001 From: Qi Chen Date: Fri, 10 Nov 2023 09:48:01 +0800 Subject: [PATCH] [Fix](fs_benchmark_tools) Fix `run_fs_benchmark.sh` classpath issue. (#26183) (#26704) Backport from #26183. --- bin/run-fs-benchmark.sh | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/bin/run-fs-benchmark.sh b/bin/run-fs-benchmark.sh index 8eb0781106a0de..e446d2fb4ed95d 100755 --- a/bin/run-fs-benchmark.sh +++ b/bin/run-fs-benchmark.sh @@ -47,12 +47,17 @@ if [[ "${MAX_FILE_COUNT}" -lt 65536 ]]; then fi # add java libs -for f in "${DORIS_HOME}/lib/java_extensions"/*.jar; do - if [[ -z "${DORIS_CLASSPATH}" ]]; then - export DORIS_CLASSPATH="${f}" - else - export DORIS_CLASSPATH="${f}:${DORIS_CLASSPATH}" - fi +preload_jars=("preload-extensions") +preload_jars+=("java-udf") + +for preload_jar_dir in "${preload_jars[@]}"; do + for f in "${DORIS_HOME}/lib/java_extensions/${preload_jar_dir}"/*.jar; do + if [[ -z "${DORIS_CLASSPATH}" ]]; then + export DORIS_CLASSPATH="${f}" + else + export DORIS_CLASSPATH="${DORIS_CLASSPATH}:${f}" + fi + done done if [[ -d "${DORIS_HOME}/lib/hadoop_hdfs/" ]]; then @@ -71,6 +76,13 @@ if [[ -d "${DORIS_HOME}/lib/hadoop_hdfs/" ]]; then done fi +# add custome_libs to CLASSPATH +if [[ -d "${DORIS_HOME}/custom_lib" ]]; then + for f in "${DORIS_HOME}/custom_lib"/*.jar; do + DORIS_CLASSPATH="${DORIS_CLASSPATH}:${f}" + done +fi + if [[ -n "${HADOOP_CONF_DIR}" ]]; then export DORIS_CLASSPATH="${DORIS_CLASSPATH}:${HADOOP_CONF_DIR}" fi