This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 8586594e007 [fix](class-loader) fix class loader conflict on BE side
#29942 (#29941)
8586594e007 is described below
commit 8586594e0073a653c11d1d0aafc4aa0f4db64b84
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Sat Jan 13 23:20:18 2024 +0800
[fix](class-loader) fix class loader conflict on BE side #29942 (#29941)
bp #29942
---
bin/start_be.sh | 30 +++++++++++++-----------
fe/be-java-extensions/preload-extensions/pom.xml | 2 ++
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/bin/start_be.sh b/bin/start_be.sh
index 7d196e95f59..9fa13e95ae3 100755
--- a/bin/start_be.sh
+++ b/bin/start_be.sh
@@ -88,6 +88,22 @@ if [[ "$(swapon -s | wc -l)" -gt 1 ]]; then
exit 1
fi
+# add java libs
+# Must add hadoop libs, because we should load specified jars
+# instead of jars in hadoop libs, such as avro
+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
# add hadoop libs
for f in "${DORIS_HOME}/lib/hadoop_hdfs/common"/*.jar; do
@@ -104,20 +120,6 @@ if [[ -d "${DORIS_HOME}/lib/hadoop_hdfs/" ]]; then
done
fi
-# add java libs
-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
-
# add custome_libs to CLASSPATH
if [[ -d "${DORIS_HOME}/custom_lib" ]]; then
for f in "${DORIS_HOME}/custom_lib"/*.jar; do
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index 830ee1ea8f4..a63c0a9b238 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -60,6 +60,8 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <!-- Must be provided, we use hadoop_libs in BE's 3rd party
instead -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hudi</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
