Skip to content

Commit 7887a47

Browse files
committed
[KYUUBI #1996] Clean up log4j2 conf and enhance surefire plugin conf
### _Why are the changes needed?_ [THRIFT-4805](https://issues.apache.org/jira/browse/THRIFT-4805) has been fixed in thrift 0.13.0, we can remove the workaround of log4j2 configurations because we use thrift 0.16.0 now, the change also removes the following warnings. ``` 2022-03-01 23:18:16,530 main ERROR Filters contains invalid attributes "onMatch", "onMismatch" 2022-03-01 23:18:16,543 main ERROR Filters contains invalid attributes "onMatch", "onMismatch" ``` `maven-surefire-plugin` is only used in `kyuubi-hive-jdbc`, we should disable it in other modules. ``` [INFO] --- maven-surefire-plugin:2.22.0:test (default-test) kyuubi-ctl_2.12 --- [INFO] [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- 2022-03-01 23:18:16,530 main ERROR Filters contains invalid attributes "onMatch", "onMismatch" 2022-03-01 23:18:16,543 main ERROR Filters contains invalid attributes "onMatch", "onMismatch" [INFO] Running org.apache.kyuubi.ctl.ServiceControlCliSuite [INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s - in org.apache.kyuubi.ctl.ServiceControlCliSuite [INFO] Running org.apache.kyuubi.ctl.ServiceControlCliArgumentsSuite [INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 s - in org.apache.kyuubi.ctl.ServiceControlCliArgumentsSuite [INFO] [INFO] Results: [INFO] [INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0 ``` ### _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 #1996 from pan3793/log. Closes #1996 291441c [Cheng Pan] nit f2c9424 [Cheng Pan] Tune surefire plugin in conf e1ee640 [Cheng Pan] Clean up log4j2 conf Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
1 parent 5d400ea commit 7887a47

File tree

20 files changed

+66
-342
lines changed

20 files changed

+66
-342
lines changed

conf/log4j2.properties.template

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,8 @@ appender.console.name = STDOUT
2525
appender.console.target = SYSTEM_OUT
2626
appender.console.layout.type = PatternLayout
2727
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
28-
29-
appender.console.filter.1.type = Filters
30-
31-
appender.console.filter.1.a.type = ThresholdFilter
32-
appender.console.filter.1.a.level = info
33-
34-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
35-
appender.console.filter.1.b.type = RegexFilter
36-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
37-
appender.console.filter.1.b.onMatch = deny
38-
appender.console.filter.1.b.onMismatch = neutral
28+
appender.console.filter.a.type = ThresholdFilter
29+
appender.console.filter.a.level = info
3930

4031
# Set the default kyuubi-ctl log level to WARN. When running the kyuubi-ctl, the
4132
# log level for this class is used to overwrite the root logger's log level.

dev/kyuubi-extension-spark-3-1/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

dev/kyuubi-extension-spark-3-2/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

dev/kyuubi-extension-spark-common/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

docs/deployment/settings.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -407,17 +407,8 @@ appender.console.name = STDOUT
407407
appender.console.target = SYSTEM_OUT
408408
appender.console.layout.type = PatternLayout
409409
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
410-
411-
appender.console.filter.1.type = Filters
412-
413-
appender.console.filter.1.a.type = ThresholdFilter
414-
appender.console.filter.1.a.level = info
415-
416-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
417-
appender.console.filter.1.b.type = RegexFilter
418-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
419-
appender.console.filter.1.b.onMatch = deny
420-
appender.console.filter.1.b.onMismatch = neutral
410+
appender.console.filter.a.type = ThresholdFilter
411+
appender.console.filter.a.level = info
421412

422413
# Set the default kyuubi-ctl log level to WARN. When running the kyuubi-ctl, the
423414
# log level for this class is used to overwrite the root logger's log level.

externals/kyuubi-flink-sql-engine/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

externals/kyuubi-spark-sql-engine/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

externals/kyuubi-trino-engine/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

integration-tests/kyuubi-flink-it/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to DEBUG
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = debug
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = debug

integration-tests/kyuubi-kubernetes-deployment-it/src/test/resources/log4j2-test.properties

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,15 @@ appender.console.name = STDOUT
2626
appender.console.target = SYSTEM_OUT
2727
appender.console.layout.type = PatternLayout
2828
appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %m%n
29-
30-
appender.console.filter.1.type = Filters
31-
32-
appender.console.filter.1.a.type = ThresholdFilter
33-
appender.console.filter.1.a.level = fatal
34-
35-
# SPARK-34128: Suppress undesirable TTransportException warnings, due to THRIFT-4805
36-
appender.console.filter.1.b.type = RegexFilter
37-
appender.console.filter.1.b.regex = .*Thrift error occurred during processing of message.*
38-
appender.console.filter.1.b.onMatch = deny
39-
appender.console.filter.1.b.onMismatch = neutral
29+
appender.console.filter.a.type = ThresholdFilter
30+
appender.console.filter.a.level = fatal
4031

4132
# File Appender
4233
appender.file.type = File
4334
appender.file.name = File
4435
appender.file.fileName = target/unit-tests.log
4536
appender.file.layout.type = PatternLayout
4637
appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n
47-
48-
appender.file.filter.1.type = Filters
49-
50-
appender.file.filter.1.a.type = RegexFilter
51-
appender.file.filter.1.a.regex = .*Thrift error occurred during processing of message.*
52-
appender.file.filter.1.a.onMatch = deny
53-
appender.file.filter.1.a.onMismatch = neutral
54-
5538
# Set the logger level of File Appender to INFO
56-
appender.file.filter.1.b.type = ThresholdFilter
57-
appender.file.filter.1.b.level = info
39+
appender.file.filter.a.type = ThresholdFilter
40+
appender.file.filter.a.level = info

0 commit comments

Comments
 (0)