diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java index 259c12f..18060a5 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.commons.compress.utils.CharsetNames; +import org.apache.hadoop.hive.ql.session.SessionState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.conf.HiveConf; @@ -112,6 +113,9 @@ public static HiveSparkClient createHiveSparkClient(HiveConf hiveconf) throws Ex sparkMaster = sparkConf.get("spark.master"); hiveConf.set("spark.master", sparkMaster); } + if (SessionState.get() != null && SessionState.get().getConf() != null) { + SessionState.get().getConf().set("spark.master", sparkMaster); + } if (sparkMaster.equals("yarn-cluster")) { sparkConf.put("spark.yarn.maxAppAttempts", "1"); }