HIVE-11751: hive-exec-log4j2.xml settings causes DEBUG messages to be generated and ignored (Prasanth Jayachandran reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/753fed62 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/753fed62 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/753fed62 Branch: refs/heads/spark Commit: 753fed62d639179ef30d8db4d58f44ecfa7d2ee4 Parents: f4361bf Author: Prasanth Jayachandran <j.prasant...@gmail.com> Authored: Fri Sep 11 12:03:12 2015 -0500 Committer: Prasanth Jayachandran <j.prasant...@gmail.com> Committed: Fri Sep 11 12:03:12 2015 -0500 ---------------------------------------------------------------------- beeline/src/main/resources/beeline-log4j2.xml | 5 ++--- common/src/main/resources/hive-log4j2.xml | 5 ++--- common/src/test/resources/hive-exec-log4j2-test.xml | 5 ++--- common/src/test/resources/hive-log4j2-test.xml | 5 ++--- data/conf/hive-log4j2.xml | 5 ++--- .../test/e2e/templeton/deployers/config/hive/hive-log4j2.xml | 5 ++--- hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml | 5 ++--- ql/src/main/resources/hive-exec-log4j2.xml | 5 ++--- ql/src/main/resources/tez-container-log4j2.xml | 5 ++--- testutils/ptest2/src/main/resources/log4j2.xml | 5 ++--- 10 files changed, 20 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/beeline/src/main/resources/beeline-log4j2.xml ---------------------------------------------------------------------- diff --git a/beeline/src/main/resources/beeline-log4j2.xml b/beeline/src/main/resources/beeline-log4j2.xml index 2349c5a..a64f55e 100644 --- a/beeline/src/main/resources/beeline-log4j2.xml +++ b/beeline/src/main/resources/beeline-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">DEBUG</Property> <Property name="hive.log.level">WARN</Property> <Property name="hive.root.logger">console</Property> </Properties> @@ -32,8 +31,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> </Root> </Loggers> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/common/src/main/resources/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/common/src/main/resources/hive-log4j2.xml b/common/src/main/resources/hive-log4j2.xml index 31b8fcc..3834547 100644 --- a/common/src/main/resources/hive-log4j2.xml +++ b/common/src/main/resources/hive-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">ALL</Property> <Property name="hive.log.level">INFO</Property> <Property name="hive.root.logger">DRFA</Property> <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property> @@ -68,8 +67,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/common/src/test/resources/hive-exec-log4j2-test.xml ---------------------------------------------------------------------- diff --git a/common/src/test/resources/hive-exec-log4j2-test.xml b/common/src/test/resources/hive-exec-log4j2-test.xml index 1d91b26..03487de 100644 --- a/common/src/test/resources/hive-exec-log4j2-test.xml +++ b/common/src/test/resources/hive-exec-log4j2-test.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">DEBUG</Property> <Property name="hive.log.level">INFO</Property> <Property name="hive.root.logger">FA</Property> <Property name="hive.log.dir">${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging</Property> @@ -41,8 +40,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/common/src/test/resources/hive-log4j2-test.xml ---------------------------------------------------------------------- diff --git a/common/src/test/resources/hive-log4j2-test.xml b/common/src/test/resources/hive-log4j2-test.xml index 98ca6f8..0297e88 100644 --- a/common/src/test/resources/hive-log4j2-test.xml +++ b/common/src/test/resources/hive-log4j2-test.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">DEBUG</Property> <Property name="hive.log.level">WARN</Property> <Property name="hive.root.logger">DRFA</Property> <Property name="hive.log.dir">${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging</Property> @@ -50,8 +49,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/data/conf/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/data/conf/hive-log4j2.xml b/data/conf/hive-log4j2.xml index 452f01f..48a584f 100644 --- a/data/conf/hive-log4j2.xml +++ b/data/conf/hive-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">DEBUG</Property> <Property name="hive.log.level">DEBUG</Property> <Property name="hive.root.logger">DRFA</Property> <Property name="hive.log.dir">${sys:test.tmp.dir}/log</Property> @@ -68,8 +67,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml index 30f7603..87e18e2 100644 --- a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml +++ b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">ALL</Property> <Property name="hive.log.level">DEBUG</Property> <Property name="hive.root.logger">DRFA</Property> <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property> @@ -68,8 +67,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml index 96f0974..ef8e73d 100644 --- a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml +++ b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="webhcat.log.threshold">DEBUG</Property> <Property name="webhcat.log.level">INFO</Property> <Property name="webhcat.root.logger">standard</Property> <Property name="webhcat.log.dir">.</Property> @@ -48,8 +47,8 @@ </Appenders> <Loggers> - <Root level="${sys:webhcat.log.threshold}"> - <AppenderRef ref="${sys:webhcat.root.logger}" level="${sys:webhcat.log.level}"/> + <Root level="${sys:webhcat.log.level}"> + <AppenderRef ref="${sys:webhcat.root.logger}"/> </Root> <Logger name="com.sun.jersey" level="DEBUG"> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/ql/src/main/resources/hive-exec-log4j2.xml ---------------------------------------------------------------------- diff --git a/ql/src/main/resources/hive-exec-log4j2.xml b/ql/src/main/resources/hive-exec-log4j2.xml index 8b520a2..8ed8b60 100644 --- a/ql/src/main/resources/hive-exec-log4j2.xml +++ b/ql/src/main/resources/hive-exec-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.log.threshold">DEBUG</Property> <Property name="hive.log.level">INFO</Property> <Property name="hive.root.logger">FA</Property> <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property> @@ -67,8 +66,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.log.threshold}"> - <AppenderRef ref="${sys:hive.root.logger}" level="${sys:hive.log.level}"/> + <Root level="${sys:hive.log.level}"> + <AppenderRef ref="${sys:hive.root.logger}"/> <AppenderRef ref="EventCounter" /> </Root> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/ql/src/main/resources/tez-container-log4j2.xml ---------------------------------------------------------------------- diff --git a/ql/src/main/resources/tez-container-log4j2.xml b/ql/src/main/resources/tez-container-log4j2.xml index be949dc..604e586 100644 --- a/ql/src/main/resources/tez-container-log4j2.xml +++ b/ql/src/main/resources/tez-container-log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="tez.container.log.threshold">ALL</Property> <Property name="tez.container.log.level">INFO</Property> <Property name="tez.container.root.logger">CLA</Property> <Property name="tez.container.log.dir">${sys:yarn.app.container.log.dir}</Property> @@ -41,8 +40,8 @@ </Appenders> <Loggers> - <Root level="${sys:tez.container.log.threshold}"> - <AppenderRef ref="${sys:tez.container.root.logger}" level="${sys:tez.container.log.level}"/> + <Root level="${sys:tez.container.log.level}"> + <AppenderRef ref="${sys:tez.container.root.logger}"/> </Root> </Loggers> http://git-wip-us.apache.org/repos/asf/hive/blob/753fed62/testutils/ptest2/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/resources/log4j2.xml b/testutils/ptest2/src/main/resources/log4j2.xml index 42141b7..8eb3234 100644 --- a/testutils/ptest2/src/main/resources/log4j2.xml +++ b/testutils/ptest2/src/main/resources/log4j2.xml @@ -20,7 +20,6 @@ packages="org.apache.hadoop.hive.ql.log"> <Properties> - <Property name="hive.ptest.log.threshold">DEBUG</Property> <Property name="hive.ptest.log.level">DEBUG</Property> <Property name="hive.ptest.root.logger">FILE</Property> <Property name="hive.ptest.log.dir">target</Property> @@ -45,8 +44,8 @@ </Appenders> <Loggers> - <Root level="${sys:hive.ptest.log.threshold}"> - <AppenderRef ref="${sys:hive.ptest.root.logger}" level="${sys:hive.ptest.log.level}"/> + <Root level="${sys:hive.ptest.log.level}"> + <AppenderRef ref="${sys:hive.ptest.root.logger}"/> </Root> <Logger name="org.apache.http" level="INFO">