You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/09/06 02:09:07 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #3399] [TEST] Add log4j conf for Spark lineage plugin module

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

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ecf244bf [KYUUBI #3399] [TEST] Add log4j conf for Spark lineage plugin module
6ecf244bf is described below

commit 6ecf244bf393297e796f45b65eee4ce3eff5f89e
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Tue Sep 6 10:08:55 2022 +0800

    [KYUUBI #3399] [TEST] Add log4j conf for Spark lineage plugin module
    
    ### _Why are the changes needed?_
    
    Redirect logs to `target/unit-tests.log` as other modules did.
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #3399 from pan3793/lineage-log.
    
    Closes #3399
    
    531b8dbb [Cheng Pan] nit
    543577cd [Cheng Pan] [TEST] Add log4j conf for Spark lineage plugin module
    
    Authored-by: Cheng Pan <ch...@apache.org>
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/resources/log4j.properties            |  2 -
 .../src/test/scala}/resources/log4j.properties     |  2 -
 .../src/test/scala/resources/log4j2-test.xml       | 43 ++++++++++++++++++++++
 8 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties b/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-extension-spark-3-2/src/test/resources/log4j.properties b/extensions/spark/kyuubi-extension-spark-3-2/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-extension-spark-3-2/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-extension-spark-3-2/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-spark-authz/src/test/resources/log4j.properties b/extensions/spark/kyuubi-spark-authz/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-spark-authz/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-spark-authz/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-spark-connector-common/src/test/resources/log4j.properties b/extensions/spark/kyuubi-spark-connector-common/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-spark-connector-common/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-spark-connector-common/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-spark-connector-tpcds/src/test/resources/log4j.properties b/extensions/spark/kyuubi-spark-connector-tpcds/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-spark-connector-tpcds/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-spark-connector-tpcds/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-spark-connector-tpch/src/test/resources/log4j.properties b/extensions/spark/kyuubi-spark-connector-tpch/src/test/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-spark-connector-tpch/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-spark-connector-tpch/src/test/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties b/extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j.properties
similarity index 97%
copy from extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties
copy to extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j.properties
index 68d6a0e66..ce168ae48 100644
--- a/extensions/spark/kyuubi-extension-spark-3-1/src/test/resources/log4j.properties
+++ b/extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j.properties
@@ -30,8 +30,6 @@ log4j.appender.FA.append=false
 log4j.appender.FA.file=target/unit-tests.log
 log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{HH:mm:ss.SSS} %t %p %c{2}: %m%n
-
-# Set the logger level of File Appender to WARN
 log4j.appender.FA.Threshold = DEBUG
 
 # SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805
diff --git a/extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j2-test.xml b/extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j2-test.xml
new file mode 100644
index 000000000..bfc40dd6d
--- /dev/null
+++ b/extensions/spark/kyuubi-spark-lineage/src/test/scala/resources/log4j2-test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- Extra logging related to initialization of Log4j. 
+ Set to debug or trace if log4j initialization is failing. -->
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n"/>
+            <Filters>
+                <ThresholdFilter level="FATAL"/>
+                <RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+        </Console>
+        <File name="file" fileName="target/unit-tests.log">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n"/>
+            <Filters>
+                <RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+        </File>
+    </Appenders>
+    <Loggers>
+        <Root level="INFO">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="file"/>
+        </Root>
+    </Loggers>
+</Configuration>