This is an automated email from the ASF dual-hosted git repository.
okumin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new a1c24873071 HIVE-29026: Cleanup Log4j properties file to adhere to 2.x
changes (#5885)
a1c24873071 is described below
commit a1c2487307171b2c208a649ca33ffc1ec1b90256
Author: Raghav Aggarwal <raghavaggarwal03...@gmail.com>
AuthorDate: Tue Jul 8 08:49:14 2025 +0530
HIVE-29026: Cleanup Log4j properties file to adhere to 2.x changes (#5885)
---
.../src/main/resources/beeline-log4j2.properties | 8 ----
common/src/main/resources/hive-log4j2.properties | 12 +-----
.../resources/hive-exec-log4j2-test.properties | 8 ----
.../src/test/resources/hive-log4j2-test.properties | 8 ----
.../deployers/config/hive/hive-log4j2.properties | 8 ----
.../svr/src/main/config/webhcat-log4j2.properties | 8 ----
.../src/test/resources/log4j.properties | 24 ------------
.../hive-jmh/src/main/resources/log4j2.properties | 7 ----
.../src/main/resources/llap-cli-log4j2.properties | 8 ----
.../main/resources/llap-daemon-log4j2.properties | 8 ----
.../test/resources/llap-daemon-log4j2.properties | 8 ----
.../llap-daemon-routing-log4j2.properties | 8 ----
llap-server/src/test/resources/log4j2.properties | 5 ---
packaging/src/docker/conf/hive-log4j2.properties | 8 ----
ql/src/main/resources/hive-exec-log4j2.properties | 8 ----
.../main/resources/tez-container-log4j2.properties | 5 ---
.../log4j2_test_sliding_rollover.properties | 9 -----
.../src/test/resources/log4j2.properties | 6 +--
.../src/test/resources/log4j2.properties | 6 +--
standalone-metastore/metastore-server/pom.xml | 4 +-
.../main/resources/datanucleus-log4j.properties | 34 ----------------
.../src/main/resources/datanucleus-log4j2.xml | 45 ++++++++++++++++++++++
.../src/main/resources/metastore-log4j2.properties | 8 ----
.../src/test/resources/log4j2.properties | 4 +-
.../{log4j.properties => log4j2.properties} | 9 +++--
.../src/main/resources/log4j2.xml | 4 +-
.../src/docker/conf/metastore-log4j2.properties | 8 ----
27 files changed, 62 insertions(+), 216 deletions(-)
diff --git a/beeline/src/main/resources/beeline-log4j2.properties
b/beeline/src/main/resources/beeline-log4j2.properties
index 1300609ac87..2443ee2b0e1 100644
--- a/beeline/src/main/resources/beeline-log4j2.properties
+++ b/beeline/src/main/resources/beeline-log4j2.properties
@@ -14,17 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = BeelineLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = WARN
property.hive.root.logger = console
-# list of all appenders
-appenders = console
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -32,9 +27,6 @@ appender.console.target = SYSTEM_ERR
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
-# list of all loggers
-loggers = HiveConnection, HiveJDBC
-
# HiveConnection logs useful info for dynamic service discovery
logger.HiveConnection.name = org.apache.hive.jdbc.HiveConnection
logger.HiveConnection.level = INFO
diff --git a/common/src/main/resources/hive-log4j2.properties
b/common/src/main/resources/hive-log4j2.properties
index b1719907571..b51e93697b3 100644
--- a/common/src/main/resources/hive-log4j2.properties
+++ b/common/src/main/resources/hive-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HiveLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = INFO
@@ -25,9 +23,6 @@ property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
property.hive.log.file = hive.log
property.hive.perflogger.log.level = INFO
-# list of all appenders
-appenders = console, DRFA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -50,9 +45,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX,
PerfLogger, AmazonAws, ApacheHttp
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
@@ -68,10 +60,10 @@ logger.Datastore.level = ERROR
logger.JPOX.name = JPOX
logger.JPOX.level = ERROR
-logger.AmazonAws.name=com.amazonaws
+logger.AmazonAws.name = com.amazonaws
logger.AmazonAws.level = INFO
-logger.ApacheHttp.name=org.apache.http
+logger.ApacheHttp.name = org.apache.http
logger.ApacheHttp.level = INFO
logger.PerfLogger.name = org.apache.hadoop.hive.ql.log.PerfLogger
diff --git a/common/src/test/resources/hive-exec-log4j2-test.properties
b/common/src/test/resources/hive-exec-log4j2-test.properties
index cc8871e9908..7ded2e3694b 100644
--- a/common/src/test/resources/hive-exec-log4j2-test.properties
+++ b/common/src/test/resources/hive-exec-log4j2-test.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HiveExecLog4j2Test
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = INFO
@@ -24,9 +22,6 @@ property.hive.root.logger = FA
property.hive.log.dir = ${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging
property.hive.log.file = hiveExecLog4j2Test.log
-# list of all appenders
-appenders = console, FA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -41,9 +36,6 @@ appender.FA.fileName =
${sys:hive.log.dir}/${sys:hive.log.file}
appender.FA.layout.type = PatternLayout
appender.FA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git a/common/src/test/resources/hive-log4j2-test.properties
b/common/src/test/resources/hive-log4j2-test.properties
index 7fd5e42f117..0fabdac2a21 100644
--- a/common/src/test/resources/hive-log4j2-test.properties
+++ b/common/src/test/resources/hive-log4j2-test.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HiveLog4j2Test
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = WARN
@@ -24,9 +22,6 @@ property.hive.root.logger = DRFA
property.hive.log.dir = ${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging
property.hive.log.file = hiveLog4j2Test.log
-# list of all appenders
-appenders = console, DRFA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -48,9 +43,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git
a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
index 1cf3bd68749..875419f3bbb 100644
---
a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
+++
b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HCatE2ELog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = DEBUG
@@ -24,9 +22,6 @@ property.hive.root.logger = DRFA
property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
property.hive.log.file = hive.log
-# list of all appenders
-appenders = console, DRFA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -48,9 +43,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
index 3ea2c7b4159..e25a91c1c32 100644
--- a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
+++ b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = WebhcatLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.webhcat.log.level = INFO
@@ -24,9 +22,6 @@ property.webhcat.root.logger = standard
property.webhcat.log.dir = .
property.webhcat.log.file = webhcat.log
-# list of all appenders
-appenders = console, standard
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -48,9 +43,6 @@ appender.standard.policies.time.modulate = true
appender.standard.strategy.type = DefaultRolloverStrategy
appender.standard.strategy.max = 30
-# list of all loggers
-loggers = Jersey, WebComponent, Hadoop, HadoopConf, Zookeeper, Jetty
-
logger.Jersey.name = com.sun.jersey
logger.Jersey.level = DEBUG
diff --git a/iceberg/iceberg-handler/src/test/resources/log4j.properties
b/iceberg/iceberg-handler/src/test/resources/log4j.properties
deleted file mode 100644
index e91cd7e2b4f..00000000000
--- a/iceberg/iceberg-handler/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-# Configuration for modules which are using log4j v1 (e.g. Hive2, DataNucleus)
-
-log4j.rootLogger=WARN,stdout
-log4j.threshold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}
(%F:%M(%L)) - %m%n
diff --git a/itests/hive-jmh/src/main/resources/log4j2.properties
b/itests/hive-jmh/src/main/resources/log4j2.properties
index 6bbe9e966e8..0bfb671be4e 100644
--- a/itests/hive-jmh/src/main/resources/log4j2.properties
+++ b/itests/hive-jmh/src/main/resources/log4j2.properties
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = FATAL
name = HiveJMH
# list of properties
@@ -23,9 +22,6 @@ property.hive-jmh.root.logger = DRFA
property.hive-jmh.log.dir = target/tmp/log
property.hive-jmh.log.file = hive-jmh.log
-# list of all appenders
-appenders = console, DRFA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -47,9 +43,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = Jetty, AbstractLifeCycle
-
logger.Jetty.name = org.eclipse.jetty
logger.Jetty.level = WARN
diff --git a/llap-server/src/main/resources/llap-cli-log4j2.properties
b/llap-server/src/main/resources/llap-cli-log4j2.properties
index 687c97399a6..8fbef6f4a2c 100644
--- a/llap-server/src/main/resources/llap-cli-log4j2.properties
+++ b/llap-server/src/main/resources/llap-cli-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = WARN
name = LlapCliLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = WARN
@@ -25,9 +23,6 @@ property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
property.hive.log.file = llap-cli.log
property.hive.llapstatus.consolelogger.level = INFO
-# list of all appenders
-appenders = console, DRFA, llapstatusconsole
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -57,9 +52,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = ZooKeeper, DataNucleus, Datastore, JPOX, HadoopConf,
LlapStatusServiceDriverConsole
-
logger.ZooKeeper.name = org.apache.zookeeper
logger.ZooKeeper.level = WARN
diff --git a/llap-server/src/main/resources/llap-daemon-log4j2.properties
b/llap-server/src/main/resources/llap-daemon-log4j2.properties
index 5da0c8d31d4..bc62a6004b8 100644
--- a/llap-server/src/main/resources/llap-daemon-log4j2.properties
+++ b/llap-server/src/main/resources/llap-daemon-log4j2.properties
@@ -21,9 +21,7 @@
# Note: Some names and logic is common to this file and llap LogHelpers. Make
sure to change that
# as well, if changing this file.
-status = INFO
name = LlapDaemonLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.llap.daemon.log.level = INFO
@@ -34,9 +32,6 @@ property.llap.daemon.historylog.file = llapdaemon_history.log
property.llap.daemon.log.maxfilesize = 256MB
property.llap.daemon.log.maxbackupindex = 240
-# list of all appenders
-appenders = console, RFA, HISTORYAPPENDER, query-routing
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -97,9 +92,6 @@ appender.query-routing.routes.route-mdc.file-mdc.fileName =
${sys:llap.daemon.lo
appender.query-routing.routes.route-mdc.file-mdc.layout.type = PatternLayout
appender.query-routing.routes.route-mdc.file-mdc.layout.pattern = %d{ISO8601}
%5p [%t (%X{fragmentId})] %c{2}: %m%n
-# list of all loggers
-loggers = PerfLogger, EncodedReader, NIOServerCnxn, ClientCnxnSocketNIO,
DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc,
LlapIoCache, LlapIoLocking, TezSM, TezSS, TezHC, LlapDaemon, TaskExecutorService
-
logger.LlapDaemon.name = org.apache.hadoop.hive.llap.daemon.impl.LlapDaemon
logger.LlapDaemon.level = INFO
diff --git a/llap-server/src/test/resources/llap-daemon-log4j2.properties
b/llap-server/src/test/resources/llap-daemon-log4j2.properties
index dbf59e68584..a246f62dd0e 100644
--- a/llap-server/src/test/resources/llap-daemon-log4j2.properties
+++ b/llap-server/src/test/resources/llap-daemon-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = LlapDaemonLog4j2Test
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.llap.daemon.log.level = INFO
@@ -27,9 +25,6 @@ property.llap.daemon.historylog.file = llapdaemon_history.log
property.llap.daemon.log.maxfilesize = 256MB
property.llap.daemon.log.maxbackupindex = 20
-# list of all appenders
-appenders = console, RFA, HISTORYAPPENDER
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -63,9 +58,6 @@ appender.HISTORYAPPENDER.policies.size.size =
${sys:llap.daemon.log.maxfilesize}
appender.HISTORYAPPENDER.strategy.type = DefaultRolloverStrategy
appender.HISTORYAPPENDER.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX,
HistoryLogger
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git
a/llap-server/src/test/resources/llap-daemon-routing-log4j2.properties
b/llap-server/src/test/resources/llap-daemon-routing-log4j2.properties
index c791ca71c1c..0092c9808ea 100644
--- a/llap-server/src/test/resources/llap-daemon-routing-log4j2.properties
+++ b/llap-server/src/test/resources/llap-daemon-routing-log4j2.properties
@@ -21,9 +21,7 @@
# - Default value for llap.daemon.log.dir is java.io.tmpdir to avoid polluting
the current directory when running tests
# - purgePolicy.timeToLive is set to 5 sec so that tests finish faster (value
should be much bigger in prod)
-status = INFO
name = TestLlapDaemonRoutingLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.llap.daemon.log.level = INFO
@@ -34,9 +32,6 @@ property.llap.daemon.historylog.file = llapdaemon_history.log
property.llap.daemon.log.maxfilesize = 256MB
property.llap.daemon.log.maxbackupindex = 240
-# list of all appenders
-appenders = console, RFA, HISTORYAPPENDER, query-routing
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -97,9 +92,6 @@ appender.query-routing.routes.route-mdc.file-mdc.fileName =
${sys:llap.daemon.lo
appender.query-routing.routes.route-mdc.file-mdc.layout.type = PatternLayout
appender.query-routing.routes.route-mdc.file-mdc.layout.pattern = %d{ISO8601}
%5p [%t (%X{fragmentId})] %c{2}: %m%n
-# list of all loggers
-loggers = PerfLogger, EncodedReader, NIOServerCnxn, ClientCnxnSocketNIO,
DataNucleus, Datastore, JPOX, HistoryLogger, LlapIoImpl, LlapIoOrc,
LlapIoCache, LlapIoLocking, TezSM, TezSS, TezHC, LlapDaemon, TaskExecutorService
-
logger.LlapDaemon.name = org.apache.hadoop.hive.llap.daemon.impl.LlapDaemon
logger.LlapDaemon.level = INFO
diff --git a/llap-server/src/test/resources/log4j2.properties
b/llap-server/src/test/resources/log4j2.properties
index 8bad9d82ac1..036bab31311 100644
--- a/llap-server/src/test/resources/log4j2.properties
+++ b/llap-server/src/test/resources/log4j2.properties
@@ -14,17 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = LlapLog4j2Test
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.llap.daemon.log.level = INFO
property.llap.daemon.root.logger = console
-# list of all appenders
-appenders = console
-
# console appender
appender.console.type = Console
appender.console.name = console
diff --git a/packaging/src/docker/conf/hive-log4j2.properties
b/packaging/src/docker/conf/hive-log4j2.properties
index 6863e6cbf5a..f176f57f18c 100644
--- a/packaging/src/docker/conf/hive-log4j2.properties
+++ b/packaging/src/docker/conf/hive-log4j2.properties
@@ -14,27 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HiveLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = INFO
property.hive.root.logger = stdout
property.hive.perflogger.log.level = INFO
-# list of all appenders
-appenders = console
-
# console appender
appender.console.name = stdout
appender.console.type = Console
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX,
PerfLogger, AmazonAws, ApacheHttp
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git a/ql/src/main/resources/hive-exec-log4j2.properties
b/ql/src/main/resources/hive-exec-log4j2.properties
index 8a7dd027850..b77b51fabeb 100644
--- a/ql/src/main/resources/hive-exec-log4j2.properties
+++ b/ql/src/main/resources/hive-exec-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = HiveExecLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = INFO
@@ -25,9 +23,6 @@ property.hive.query.id = hadoop
property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
property.hive.log.file = ${sys:hive.query.id}.log
-# list of all appenders
-appenders = console, FA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -42,9 +37,6 @@ appender.FA.fileName =
${sys:hive.log.dir}/${sys:hive.log.file}
appender.FA.layout.type = PatternLayout
appender.FA.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-# list of all loggers
-loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
-
logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
logger.NIOServerCnxn.level = WARN
diff --git a/ql/src/main/resources/tez-container-log4j2.properties
b/ql/src/main/resources/tez-container-log4j2.properties
index a048b177049..f5a2a4094af 100644
--- a/ql/src/main/resources/tez-container-log4j2.properties
+++ b/ql/src/main/resources/tez-container-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = TezContainerLog4j2
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.tez.container.log.level = INFO
@@ -24,9 +22,6 @@ property.tez.container.root.logger = CLA
property.tez.container.log.dir = ${sys:yarn.app.container.log.dir}
property.tez.container.log.file = syslog
-# list of all appenders
-appenders = CLA
-
# daily rolling file appender
appender.CLA.type = RollingRandomAccessFile
appender.CLA.name = CLA
diff --git a/ql/src/test/resources/log4j2_test_sliding_rollover.properties
b/ql/src/test/resources/log4j2_test_sliding_rollover.properties
index b88b79af049..80a04033704 100644
--- a/ql/src/test/resources/log4j2_test_sliding_rollover.properties
+++ b/ql/src/test/resources/log4j2_test_sliding_rollover.properties
@@ -17,9 +17,7 @@
# Log4j2 config that is used by TestSlidingFilenameRolloverStrategy
-status = INFO
name = Slider
-packages = org.apache.hadoop.hive.ql.log
# list of properties
property.hive.log.level = DEBUG
@@ -28,12 +26,6 @@ property.hive.log.dir = ${sys:test.tmp.dir}/log
property.hive.log.file = hive.log
property.hive.test.console.log.level = INFO
-# list of all appenders
-appenders = console, sliding
-
-# list of loggers that are not root
-loggers = lineage
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -66,4 +58,3 @@ logger.lineage.level = debug
logger.lineage.appenderRefs = sliding
logger.lineage.appenderRef.file.ref = sliding
-
diff --git
a/standalone-metastore/metastore-common/src/test/resources/log4j2.properties
b/standalone-metastore/metastore-common/src/test/resources/log4j2.properties
index bd4847c51f4..2dc501c4a68 100644
--- a/standalone-metastore/metastore-common/src/test/resources/log4j2.properties
+++ b/standalone-metastore/metastore-common/src/test/resources/log4j2.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-name=PropertiesConfig
+name = PropertiesConfig
+
property.filename = logs
-appenders = console
appender.console.type = Console
appender.console.name = STDOUT
@@ -28,8 +28,6 @@ rootLogger.level = debug
rootLogger.appenderRefs = stdout
rootLogger.appenderRef.stdout.ref = STDOUT
-loggers = HttpClient, JettyHttpServer
-
logger.HttpClient.name = org.apache.http.client
logger.HttpClient.level = INFO
diff --git
a/standalone-metastore/metastore-rest-catalog/src/test/resources/log4j2.properties
b/standalone-metastore/metastore-rest-catalog/src/test/resources/log4j2.properties
index 7d592ef2df9..7398b241557 100644
---
a/standalone-metastore/metastore-rest-catalog/src/test/resources/log4j2.properties
+++
b/standalone-metastore/metastore-rest-catalog/src/test/resources/log4j2.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-name=PropertiesConfig
+name = PropertiesConfig
+
property.filename = logs
-appenders = console
appender.console.type = Console
appender.console.name = STDOUT
@@ -28,8 +28,6 @@ rootLogger.level = INFO
rootLogger.appenderRefs = stdout
rootLogger.appenderRef.stdout.ref = STDOUT
-loggers = HttpClient, JettyHttpServer
-
logger.HttpClient.name = org.apache.http.client
logger.HttpClient.level = INFO
diff --git a/standalone-metastore/metastore-server/pom.xml
b/standalone-metastore/metastore-server/pom.xml
index 9a38be775f5..cd447a51746 100644
--- a/standalone-metastore/metastore-server/pom.xml
+++ b/standalone-metastore/metastore-server/pom.xml
@@ -737,8 +737,8 @@
<configuration>
<api>JDO</api>
<verbose>false</verbose>
-
<log4jConfiguration>${basedir}/src/main/resources/datanucleus-log4j.properties
- </log4jConfiguration>
+
<log4j2Configuration>${basedir}/src/main/resources/datanucleus-log4j2.xml
+ </log4j2Configuration>
<metadataIncludes>**/*.jdo</metadataIncludes>
<fork>false</fork>
</configuration>
diff --git
a/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties
b/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties
deleted file mode 100644
index 47aeba2058e..00000000000
---
a/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-# Define the destination and format of our logging
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=target/datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] -
%m%n
-
-# DataNucleus Categories
-log4j.category.DataNucleus.JDO=INFO, A1
-log4j.category.DataNucleus.Cache=INFO, A1
-log4j.category.DataNucleus.MetaData=INFO, A1
-log4j.category.DataNucleus.General=INFO, A1
-log4j.category.DataNucleus.Transaction=INFO, A1
-log4j.category.DataNucleus.Datastore=DEBUG, A1
-log4j.category.DataNucleus.ValueGeneration=DEBUG, A1
-
-log4j.category.DataNucleus.Enhancer=INFO, A1
-log4j.category.DataNucleus.SchemaTool=INFO, A1
diff --git
a/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j2.xml
b/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j2.xml
new file mode 100644
index 00000000000..432ad2ed1b3
--- /dev/null
+++
b/standalone-metastore/metastore-server/src/main/resources/datanucleus-log4j2.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<Configuration status="info" strict="true" name="datanucleus">
+
+ <Properties>
+ <Property name="dnFilename">target/datanucleus.log</Property>
+ </Properties>
+
+ <Appenders>
+ <Appender type="File" name="DataNucleus" fileName="${dnFilename}">
+ <Layout type="PatternLayout" pattern="%d{HH:mm:ss,SSS} (%t) %-5p [%c] -
%m%n"/>
+ </Appender>
+ </Appenders>
+
+ <Loggers>
+ <!-- DataNucleus Loggers (all) -->
+ <Logger name="DataNucleus" level="warn" additivity="false">
+ <AppenderRef ref="DataNucleus"/>
+ </Logger>
+
+ <Root level="error">
+ <AppenderRef ref="DataNucleus"/>
+ </Root>
+ </Loggers>
+
+</Configuration>
diff --git
a/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties
b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties
index ec5039b4fbd..d4a26538f18 100644
---
a/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties
+++
b/standalone-metastore/metastore-server/src/main/resources/metastore-log4j2.properties
@@ -14,9 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = MetastoreLog4j2
-packages = org.apache.hadoop.hive.metastore
# list of properties
property.metastore.log.level = INFO
@@ -25,9 +23,6 @@ property.metastore.log.dir =
${sys:java.io.tmpdir}/${sys:user.name}
property.metastore.log.file = metastore.log
property.hive.perflogger.log.level = INFO
-# list of all appenders
-appenders = console, DRFA
-
# console appender
appender.console.type = Console
appender.console.name = console
@@ -50,9 +45,6 @@ appender.DRFA.policies.time.modulate = true
appender.DRFA.strategy.type = DefaultRolloverStrategy
appender.DRFA.strategy.max = 30
-# list of all loggers
-loggers = DataNucleus, Datastore, JPOX, PerfLogger
-
logger.DataNucleus.name = DataNucleus
logger.DataNucleus.level = ERROR
diff --git
a/standalone-metastore/metastore-server/src/test/resources/log4j2.properties
b/standalone-metastore/metastore-server/src/test/resources/log4j2.properties
index fe4b8c1b8ff..6c183316cdb 100644
--- a/standalone-metastore/metastore-server/src/test/resources/log4j2.properties
+++ b/standalone-metastore/metastore-server/src/test/resources/log4j2.properties
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-name=PropertiesConfig
+name = PropertiesConfig
+
property.filename = logs
-appenders = console,captured
appender.console.type = Console
appender.console.name = STDOUT
diff --git
a/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j.properties
b/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.properties
similarity index 79%
rename from
standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j.properties
rename to
standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.properties
index 095435dc81f..5ff7c07bec0 100644
---
a/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j.properties
+++
b/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.properties
@@ -14,9 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-log4j.rootLogger=INFO, CA
+rootLogger = INFO, CA
-log4j.appender.CA=org.apache.log4j.ConsoleAppender
+appender.CA.type = Console
+appender.CA.name = console
-log4j.appender.CA.layout=org.apache.log4j.PatternLayout
-log4j.appender.CA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
\ No newline at end of file
+appender.CA.layout.type = PatternLayout
+appender.CA.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git
a/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.xml
b/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.xml
index dba13928f68..bfe7f01332f 100644
---
a/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.xml
+++
b/standalone-metastore/metastore-tools/metastore-benchmarks/src/main/resources/log4j2.xml
@@ -15,7 +15,7 @@
<Configuration status="warn"
strict="true"
name="HMSTools">
- <Appenders>
+ <Appenders>
<Appender type="Console" name="STDOUT">
<Layout type="PatternLayout"
pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
@@ -30,4 +30,4 @@
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
-</Configuration>
\ No newline at end of file
+</Configuration>
diff --git
a/standalone-metastore/packaging/src/docker/conf/metastore-log4j2.properties
b/standalone-metastore/packaging/src/docker/conf/metastore-log4j2.properties
index bb5483b056c..02e9114b4cb 100644
--- a/standalone-metastore/packaging/src/docker/conf/metastore-log4j2.properties
+++ b/standalone-metastore/packaging/src/docker/conf/metastore-log4j2.properties
@@ -14,27 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-status = INFO
name = MetastoreLog4j2
-packages = org.apache.hadoop.hive.metastore
# list of properties
property.hive.log.level = INFO
property.hive.root.logger = stdout
property.hive.perflogger.log.level = INFO
-# list of all appenders
-appenders = console
-
# console appender
appender.console.name = stdout
appender.console.type = Console
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} %5p [%t] %c{2}: %m%n
-# list of all loggers
-loggers = DataNucleus, Datastore, JPOX, PerfLogger
-
logger.DataNucleus.name = DataNucleus
logger.DataNucleus.level = ERROR
