Author: gunther
Date: Fri Apr 4 16:11:59 2014
New Revision: 1584782
URL: http://svn.apache.org/r1584782
Log:
HIVE-6743: Allow specifying the log level for Tez tasks (Siddarth Seth via
Gunther Hagleitner)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/conf/hive-default.xml.template
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL:
http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1584782&r1=1584781&r2=1584782&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri
Apr 4 16:11:59 2014
@@ -574,6 +574,7 @@ public class HiveConf extends Configurat
HIVETEZCONTAINERSIZE("hive.tez.container.size", -1),
HIVETEZJAVAOPTS("hive.tez.java.opts", null),
+ HIVETEZLOGLEVEL("hive.tez.log.level", "INFO"),
HIVEENFORCEBUCKETING("hive.enforce.bucketing", false),
HIVEENFORCESORTING("hive.enforce.sorting", false),
Modified: hive/trunk/conf/hive-default.xml.template
URL:
http://svn.apache.org/viewvc/hive/trunk/conf/hive-default.xml.template?rev=1584782&r1=1584781&r2=1584782&view=diff
==============================================================================
--- hive/trunk/conf/hive-default.xml.template (original)
+++ hive/trunk/conf/hive-default.xml.template Fri Apr 4 16:11:59 2014
@@ -2465,6 +2465,15 @@
</property>
<property>
+ <name>hive.tez.log.level</name>
+ <value>INFO</value>
+ <description>
+ The log level to use for tasks executing as part of the DAG.
+ Used only if hive.tez.java.opts is used to configure java opts.
+ </description>
+</property>
+
+<property>
<name>hive.server2.tez.default.queues</name>
<value></value>
<description>
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java?rev=1584782&r1=1584781&r2=1584782&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java Fri
Apr 4 16:11:59 2014
@@ -19,6 +19,7 @@ package org.apache.hadoop.hive.ql.exec.t
import com.google.common.base.Function;
import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -378,12 +379,18 @@ public class DagUtils {
private String getContainerJavaOpts(Configuration conf) {
String javaOpts = HiveConf.getVar(conf, HiveConf.ConfVars.HIVETEZJAVAOPTS);
if (javaOpts != null && !javaOpts.isEmpty()) {
- return javaOpts;
+ String logLevel = HiveConf.getVar(conf,
HiveConf.ConfVars.HIVETEZLOGLEVEL);
+ List<String> logProps = Lists.newArrayList();
+ MRHelpers.addLog4jSystemProperties(logLevel, logProps);
+ StringBuilder sb = new StringBuilder();
+ for (String str : logProps) {
+ sb.append(str).append(" ");
+ }
+ return javaOpts + " " + sb.toString();
}
return MRHelpers.getMapJavaOpts(conf);
}
-
/*
* Helper function to create Vertex from MapWork.
*/
