You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/02/03 08:04:10 UTC

[linkis] branch dev-1.3.2 updated: fix(metadata): fix the repeated new metadata loader bug (#4137)

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

peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
     new a01db9421 fix(metadata): fix the repeated new metadata loader bug (#4137)
a01db9421 is described below

commit a01db94218b76c48908527077af6ec4fb7026fda
Author: Jack Xu <xu...@126.com>
AuthorDate: Fri Feb 3 16:04:03 2023 +0800

    fix(metadata): fix the repeated new metadata loader bug (#4137)
---
 linkis-dist/deploy-config/linkis-env.sh                     | 13 ++++++-------
 .../query/server/loader/MetaClassLoaderManager.java         |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/linkis-dist/deploy-config/linkis-env.sh b/linkis-dist/deploy-config/linkis-env.sh
index 91b419b78..9197f7be9 100644
--- a/linkis-dist/deploy-config/linkis-env.sh
+++ b/linkis-dist/deploy-config/linkis-env.sh
@@ -73,10 +73,12 @@ YARN_RESTFUL_URL="http://127.0.0.1:8088"
 #         You can also set these variables as system environment in ~/.bashrc file
 
 #HADOOP
-HADOOP_HOME=/appcom/Install/hadoop
-HADOOP_CONF_DIR=/appcom/config/hadoop-config
-#HADOOP_KERBEROS_ENABLE=true
-#HADOOP_KEYTAB_PATH=/appcom/keytab/
+HADOOP_HOME=${HADOOP_HOME:-"/appcom/Install/hadoop"}
+HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/appcom/config/hadoop-config"}
+HADOOP_KERBEROS_ENABLE=${HADOOP_KERBEROS_ENABLE:-"false"}
+HADOOP_KEYTAB_PATH=${HADOOP_KEYTAB_PATH:-"/appcom/keytab/"}
+## Hadoop env version
+HADOOP_VERSION=${HADOOP_VERSION:-"2.7.2"}
 
 #Hive
 HIVE_HOME=/appcom/Install/hive
@@ -96,9 +98,6 @@ SPARK_CONF_DIR=/appcom/config/spark-config
 
 #PYTHON_VERSION=python2
 
-## Hadoop env version
-HADOOP_VERSION=2.7.2
-
 ################### The install Configuration of all Micro-Services #####################
 #
 #    NOTICE:
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
index 6985045b7..8513db6ac 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
@@ -104,9 +104,9 @@ public class MetaClassLoaderManager {
                         + componentLib);
                 ClassLoader parentClassLoader = MetaClassLoaderManager.class.getClassLoader();
                 ClassLoader metaClassLoader =
-                    classLoaders.compute(
+                    classLoaders.computeIfAbsent(
                         dsType,
-                        (type, classLoader) -> {
+                        (type) -> {
                           try {
                             return new URLClassLoader(
                                 getJarsUrlsOfPath(componentLib).toArray(new URL[0]),


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