This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new f382cdf89536 [SPARK-50432][BUILD] Remove workaround for THRIFT-4805
f382cdf89536 is described below
commit f382cdf895360d86f83b0a728e9ae0387763d6a4
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Dec 2 11:34:49 2024 -0800
[SPARK-50432][BUILD] Remove workaround for THRIFT-4805
### What changes were proposed in this pull request?
Remove workaround for THRIFT-4805 in log4j2 configuration files.
### Why are the changes needed?
SPARK-47018 upgrades Thrift 0.16, and THRIFT-4805 was fixed in Thrift 0.13.
### Does this PR introduce _any_ user-facing change?
Affects default logs a little.
The existing logging filter rules use a regex to filter out the noisy logs
caused by THRIFT-4805, while other problems may also produce similar logs and
silently be dropped, this change restores that.
### How was this patch tested?
Review.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #48980 from pan3793/SPARK-50432.
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
conf/log4j2.properties.pattern-layout-template | 7 -------
conf/log4j2.properties.template | 7 -------
.../src/test/resources/log4j2.properties | 15 ++-------------
3 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/conf/log4j2.properties.pattern-layout-template
b/conf/log4j2.properties.pattern-layout-template
index ab96e03baed2..011fca58c9b2 100644
--- a/conf/log4j2.properties.pattern-layout-template
+++ b/conf/log4j2.properties.pattern-layout-template
@@ -60,10 +60,3 @@ logger.RetryingHMSHandler.name =
org.apache.hadoop.hive.metastore.RetryingHMSHan
logger.RetryingHMSHandler.level = fatal
logger.FunctionRegistry.name = org.apache.hadoop.hive.ql.exec.FunctionRegistry
logger.FunctionRegistry.level = error
-
-# For deploying Spark ThriftServer
-# SPARK-34128: Suppress undesirable TTransportException warnings involved in
THRIFT-4805
-appender.console.filter.1.type = RegexFilter
-appender.console.filter.1.regex = .*Thrift error occurred during processing of
message.*
-appender.console.filter.1.onMatch = deny
-appender.console.filter.1.onMismatch = neutral
diff --git a/conf/log4j2.properties.template b/conf/log4j2.properties.template
index 876724531444..76499bb6691e 100644
--- a/conf/log4j2.properties.template
+++ b/conf/log4j2.properties.template
@@ -54,10 +54,3 @@ logger.RetryingHMSHandler.name =
org.apache.hadoop.hive.metastore.RetryingHMSHan
logger.RetryingHMSHandler.level = fatal
logger.FunctionRegistry.name = org.apache.hadoop.hive.ql.exec.FunctionRegistry
logger.FunctionRegistry.level = error
-
-# For deploying Spark ThriftServer
-# SPARK-34128: Suppress undesirable TTransportException warnings involved in
THRIFT-4805
-appender.console.filter.1.type = RegexFilter
-appender.console.filter.1.regex = .*Thrift error occurred during processing of
message.*
-appender.console.filter.1.onMatch = deny
-appender.console.filter.1.onMismatch = neutral
diff --git a/sql/hive-thriftserver/src/test/resources/log4j2.properties
b/sql/hive-thriftserver/src/test/resources/log4j2.properties
index ebb3a6ccb2fc..e6753047c905 100644
--- a/sql/hive-thriftserver/src/test/resources/log4j2.properties
+++ b/sql/hive-thriftserver/src/test/resources/log4j2.properties
@@ -32,12 +32,6 @@ appender.console.filter.1.type = Filters
appender.console.filter.1.a.type = ThresholdFilter
appender.console.filter.1.a.level = warn
-# SPARK-34128: Suppress undesirable TTransportException warnings, due to
THRIFT-4805
-appender.console.filter.1.b.type = RegexFilter
-appender.console.filter.1.b.regex = .*Thrift error occurred during processing
of message.*
-appender.console.filter.1.b.onMatch = deny
-appender.console.filter.1.b.onMismatch = neutral
-
#File Appender
appender.file.type = File
appender.file.name = File
@@ -47,14 +41,9 @@ appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}:
%m%n%ex
appender.file.filter.1.type = Filters
-appender.file.filter.1.a.type = RegexFilter
-appender.file.filter.1.a.regex = .*Thrift error occurred during processing of
message.*
-appender.file.filter.1.a.onMatch = deny
-appender.file.filter.1.a.onMismatch = neutral
-
# Set the logger level of File Appender to WARN
-appender.file.filter.1.b.type = ThresholdFilter
-appender.file.filter.1.b.level = debug
+appender.file.filter.1.a.type = ThresholdFilter
+appender.file.filter.1.a.level = debug
# Some packages are noisy for no good reason.
logger.parquet_recordreader.name =
org.apache.parquet.hadoop.ParquetRecordReader
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
