[kylin] branch main updated: KYLIN-5191 fix Can not see executors on spardar page on AWS EMR 6

[xxyu]

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

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/main by this push:
     new afa3bbaa44 KYLIN-5191 fix Can not see executors on spardar page on AWS 
EMR 6
afa3bbaa44 is described below

commit afa3bbaa44ed901b83c2ccf86222548a3cf72311
Author: WANGHui2022 <wanghui_2...@outlook.com>
AuthorDate: Wed Jun 15 21:18:24 2022 +0800

    KYLIN-5191 fix Can not see executors on spardar page on AWS EMR 6
---
 .../org/apache/kylin/spark/classloader/TomcatClassLoader.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/kylin-spark-project/kylin-spark-classloader/src/main/java/org/apache/kylin/spark/classloader/TomcatClassLoader.java
 
b/kylin-spark-project/kylin-spark-classloader/src/main/java/org/apache/kylin/spark/classloader/TomcatClassLoader.java
index 024d62877f..da53f13941 100644
--- 
a/kylin-spark-project/kylin-spark-classloader/src/main/java/org/apache/kylin/spark/classloader/TomcatClassLoader.java
+++ 
b/kylin-spark-project/kylin-spark-classloader/src/main/java/org/apache/kylin/spark/classloader/TomcatClassLoader.java
@@ -25,19 +25,22 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.catalina.loader.ParallelWebappClassLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TomcatClassLoader extends ParallelWebappClassLoader {
-    private static final String[] PARENT_CL_PRECEDENT_CLASSES = new String[] {
+    private static final String[] PARENT_CL_PRECEDENT_CLASSES = new String[]{
             // Java standard library:
             "com.sun.", "launcher.", "javax.", "org.ietf", "java", "org.omg", 
"org.w3c", "org.xml", "sunw.",
             // logging
-            "org.slf4j", "org.apache.commons.logging", "org.apache.log4j", 
"org.apache.catalina", "org.apache.tomcat"};
-    private static final String[] THIS_CL_PRECEDENT_CLASSES = new String[] 
{"org.apache.kylin",
+            "org.slf4j", "org.apache.commons.logging", "org.apache.log4j", 
"org.apache.catalina", "org.apache.tomcat",
+            // hk2 library
+            "org.glassfish.hk2"};
+    private static final String[] THIS_CL_PRECEDENT_CLASSES = new 
String[]{"org.apache.kylin",
             "org.apache.calcite"};
-    private static final String[] CODE_GEN_CLASS = new String[] 
{"org.apache.spark.sql.catalyst.expressions.Object",
+    private static final String[] CODE_GEN_CLASS = new 
String[]{"org.apache.spark.sql.catalyst.expressions.Object",
             "Baz"};
 
     private static final Set<String> wontFindClasses = new HashSet<>();