diff options
| author | Hossein <hossein@databricks.com> | 2015-09-21 21:09:59 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-09-21 21:09:59 -0700 |
| commit | c986e933a900602af47966bd41edb2116c421a39 (patch) | |
| tree | 991192212ace9c9a3130c3d759816a527c9cb609 /core | |
| parent | 0494c80ef54f6f3a8c6f2d92abfe1a77a91df8b0 (diff) | |
| download | spark-c986e933a900602af47966bd41edb2116c421a39.tar.gz spark-c986e933a900602af47966bd41edb2116c421a39.tar.bz2 spark-c986e933a900602af47966bd41edb2116c421a39.zip | |
[SPARK-10711] [SPARKR] Do not assume spark.submit.deployMode is always set
In ```RUtils.sparkRPackagePath()``` we
1. Call ``` sys.props("spark.submit.deployMode")``` which returns null if ```spark.submit.deployMode``` is not suet
2. Call ``` sparkConf.get("spark.submit.deployMode")``` which throws ```NoSuchElementException``` if ```spark.submit.deployMode``` is not set. This patch simply passes a default value ("cluster") for ```spark.submit.deployMode```.
cc rxin
Author: Hossein <hossein@databricks.com>
Closes #8832 from falaki/SPARK-10711.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/r/RUtils.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala index 9e807cc52f..fd5646b5b6 100644 --- a/core/src/main/scala/org/apache/spark/api/r/RUtils.scala +++ b/core/src/main/scala/org/apache/spark/api/r/RUtils.scala @@ -44,7 +44,7 @@ private[spark] object RUtils { (sys.props("spark.master"), sys.props("spark.submit.deployMode")) } else { val sparkConf = SparkEnv.get.conf - (sparkConf.get("spark.master"), sparkConf.get("spark.submit.deployMode")) + (sparkConf.get("spark.master"), sparkConf.get("spark.submit.deployMode", "client")) } val isYarnCluster = master != null && master.contains("yarn") && deployMode == "cluster" |