You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by li...@apache.org on 2015/04/30 04:16:02 UTC
hive git commit: HIVE-10527: NPE in
SparkUtilities::isDedicatedCluster [Spark Branch] (Rui reviewed by Jimmy)
Repository: hive
Updated Branches:
refs/heads/spark 85fb4d23a -> 5534653db
HIVE-10527: NPE in SparkUtilities::isDedicatedCluster [Spark Branch] (Rui reviewed by Jimmy)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5534653d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5534653d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5534653d
Branch: refs/heads/spark
Commit: 5534653dba4a3dd13d514c3390c0fed01948a2cb
Parents: 85fb4d2
Author: Rui Li <ru...@intel.com>
Authored: Thu Apr 30 10:15:34 2015 +0800
Committer: Rui Li <ru...@intel.com>
Committed: Thu Apr 30 10:15:34 2015 +0800
----------------------------------------------------------------------
.../apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5534653d/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 058d91d..21398d8 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
@@ -112,6 +112,7 @@ public class HiveSparkClientFactory {
String sparkMaster = hiveConf.get("spark.master");
if (sparkMaster == null) {
sparkMaster = sparkConf.get("spark.master");
+ hiveConf.set("spark.master", sparkMaster);
}
if (sparkMaster.equals("yarn-cluster")) {
sparkConf.put("spark.yarn.maxAppAttempts", "1");