Repository: hive Updated Branches: refs/heads/spark a116e96b7 -> d5603ae26
HIVE-12811: Name yarn application name more meaning than just "Hive on Spark" (Rui reviewed by Xuefu) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d5603ae2 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d5603ae2 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d5603ae2 Branch: refs/heads/spark Commit: d5603ae2619c1c4257b9b8bc993637e6b5d219e3 Parents: a116e96 Author: Rui Li <[email protected]> Authored: Wed Jan 13 10:41:27 2016 +0800 Committer: Rui Li <[email protected]> Committed: Wed Jan 13 10:41:47 2016 +0800 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 3 ++- .../hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/d5603ae2/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 53ef428..bea08ee 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2686,7 +2686,8 @@ public class HiveConf extends Configuration { private boolean isSparkRelatedConfig(String name) { boolean result = false; if (name.startsWith("spark")) { // Spark property. - result = true; + // for now we don't support changing spark app name on the fly + result = !name.equals("spark.app.name"); } else if (name.startsWith("yarn")) { // YARN property in Spark on YARN mode. String sparkMaster = get("spark.master"); if (sparkMaster != null && http://git-wip-us.apache.org/repos/asf/hive/blob/d5603ae2/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java index 9b2dce3..a832bf6 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java @@ -72,7 +72,12 @@ public class HiveSparkClientFactory { // set default spark configurations. sparkConf.put("spark.master", SPARK_DEFAULT_MASTER); - sparkConf.put("spark.app.name", SPARK_DEFAULT_APP_NAME); + final String appNameKey = "spark.app.name"; + String appName = hiveConf.get(appNameKey); + if (appName == null) { + appName = SPARK_DEFAULT_APP_NAME; + } + sparkConf.put(appNameKey, appName); sparkConf.put("spark.serializer", SPARK_DEFAULT_SERIALIZER); sparkConf.put("spark.kryo.referenceTracking", SPARK_DEFAULT_REFERENCE_TRACKING);
