HIVE-11575: Fix test failures in master due to log4j changes (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/e0594099 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e0594099 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e0594099 Branch: refs/heads/hbase-metastore Commit: e0594099c2ea1652e49ff041c6dfb569f47a5912 Parents: 9d8515d Author: Prasanth Jayachandran <j.prasant...@gmail.com> Authored: Mon Aug 17 13:47:09 2015 -0700 Committer: Prasanth Jayachandran <j.prasant...@gmail.com> Committed: Mon Aug 17 13:47:09 2015 -0700 ---------------------------------------------------------------------- data/conf/hive-log4j2.xml | 5 ++--- data/conf/hive-site.xml | 6 ------ .../service/cli/operation/TestOperationLoggingAPIWithMr.java | 2 -- .../service/cli/operation/TestOperationLoggingAPIWithTez.java | 2 -- .../hive/service/cli/operation/TestOperationLoggingLayout.java | 2 -- 5 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e0594099/data/conf/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/data/conf/hive-log4j2.xml b/data/conf/hive-log4j2.xml index 51173a0..11c8e79 100644 --- a/data/conf/hive-log4j2.xml +++ b/data/conf/hive-log4j2.xml @@ -25,7 +25,6 @@ <Property name="hive.root.logger">DRFA</Property> <Property name="hive.log.dir">${sys:test.tmp.dir}/log</Property> <Property name="hive.log.file">hive.log</Property> - <Property name="hive.ql.log.PerfLogger.level">INFO</Property> </Properties> <Appenders> @@ -95,8 +94,8 @@ <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN"> <AppenderRef ref="${sys:hive.root.logger}"/> </Logger> - <Logger name="org.apache.hadoop.hive.ql.log.PerfLogger" level="${sys:hive.ql.log.PerfLogger.level}" additivity="false"> - <AppenderRef ref="${sys:hive.root.logger}"/> + <Logger name="org.apache.hadoop.hive.ql.log.PerfLogger" level="${sys:hive.ql.log.PerfLogger.level}"> + <AppenderRef ref="${sys:hive.ql.log.PerfLogger.logger}"/> </Logger> <Logger name="org.apache.hadoop.hive.ql.exec.Operator" level="INFO"> <AppenderRef ref="${sys:hive.root.logger}"/> http://git-wip-us.apache.org/repos/asf/hive/blob/e0594099/data/conf/hive-site.xml ---------------------------------------------------------------------- diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml index 8f7fb28..a58017e 100644 --- a/data/conf/hive-site.xml +++ b/data/conf/hive-site.xml @@ -241,12 +241,6 @@ </property> <property> - <name>hive.ql.log.PerfLogger.level</name> - <value>WARN,DRFA</value> - <description>Used to change the perflogger level</description> -</property> - -<property> <name>hive.fetch.task.conversion</name> <value>minimal</value> </property> http://git-wip-us.apache.org/repos/asf/hive/blob/e0594099/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithMr.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithMr.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithMr.java index 920b563..0155b75 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithMr.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithMr.java @@ -62,8 +62,6 @@ public class TestOperationLoggingAPIWithMr extends OperationLoggingAPITestBase{ }; hiveConf = new HiveConf(); hiveConf.set(ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL.varname, "verbose"); - // We need to set the below parameter to test performance level logging - hiveConf.set("hive.ql.log.PerfLogger.level", "INFO,DRFA"); miniHS2 = new MiniHS2(hiveConf); confOverlay = new HashMap<String, String>(); confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false"); http://git-wip-us.apache.org/repos/asf/hive/blob/e0594099/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithTez.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithTez.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithTez.java index 31f34b2..ab29861 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithTez.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingAPIWithTez.java @@ -40,8 +40,6 @@ public class TestOperationLoggingAPIWithTez extends OperationLoggingAPITestBase }; hiveConf = new HiveConf(); hiveConf.set(ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL.varname, "verbose"); - // We need to set the below parameter to test performance level logging - hiveConf.set("hive.ql.log.PerfLogger.level", "INFO,DRFA"); // Change the engine to tez hiveConf.setVar(ConfVars.HIVE_EXECUTION_ENGINE, "tez"); // Set tez execution summary to false. http://git-wip-us.apache.org/repos/asf/hive/blob/e0594099/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java index 93c16de..56f6a31 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java @@ -39,8 +39,6 @@ public class TestOperationLoggingLayout { tableName = "TestOperationLoggingLayout_table"; hiveConf = new HiveConf(); hiveConf.set(HiveConf.ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL.varname, "execution"); - // We need to set the below parameter to test performance level logging - hiveConf.set("hive.ql.log.PerfLogger.level", "INFO,DRFA"); miniHS2 = new MiniHS2(hiveConf); confOverlay = new HashMap<String, String>(); confOverlay.put(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");