diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index affcbb4..18b4ed0 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -575,6 +575,7 @@ 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), diff --git conf/hive-default.xml.template conf/hive-default.xml.template index 3c3df43..eae36ec 100644 --- conf/hive-default.xml.template +++ conf/hive-default.xml.template @@ -2436,6 +2436,15 @@ + hive.tez.log.level + INFO + + 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. + + + + hive.server2.tez.default.queues diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java index e20d8bf..e7c8dc0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java @@ -19,6 +19,7 @@ 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; @@ -317,12 +318,18 @@ private Resource getContainerResource(Configuration conf) { 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 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. */