diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 4ba53106e2..e521d248db 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -4749,6 +4749,8 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "Merge adjacent joins into a single n-way join"), HIVE_LOG_N_RECORDS("hive.log.every.n.records", 0L, new RangeValidator(0L, null), "If value is greater than 0 logs in fixed intervals of size n rather than exponentially."), + HIVE_TEZ_SKIP_LOCAL_XML("hive.tez.skip.local.xml", false, "Hive excludes local xml files" + + " when sending configuration options to Tez AM when true"), /** * @deprecated Use MetastoreConf.MSCK_PATH_VALIDATION */ 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 9b2dae36a5..f75f27dfe6 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 @@ -1381,7 +1381,8 @@ public JobConf createConfiguration(HiveConf hiveConf, boolean skipAMConf) throws hiveConf.setBoolean("mapred.mapper.new-api", false); Predicate findDefaults = - (s) -> ((s != null) && (s.endsWith(".xml") || (s.endsWith(".java") && !"HiveConf.java".equals(s)))); + (s) -> ((s != null) && ((s.endsWith(".xml") && !s.endsWith("hive-site.xml")) || + (s.endsWith(".java") && !"HiveConf.java".equals(s)))); // since this is an inclusion filter, negate the predicate JobConf conf = diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java index 3599d19141..72dfad1734 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java @@ -177,8 +177,9 @@ public int execute() { ss.getHiveVariables().get("wmpool"), ss.getHiveVariables().get("wmapp")); WmContext wmContext = ctx.getWmContext(); + boolean skipXmlConfs = conf.getBoolVar(HiveConf.ConfVars.HIVE_TEZ_SKIP_LOCAL_XML); // jobConf will hold all the configuration for hadoop, tez, and hive, which are not set in AM defaults - JobConf jobConf = utils.createConfiguration(conf, false); + JobConf jobConf = utils.createConfiguration(conf, skipXmlConfs); // Get all user jars from work (e.g. input format stuff).