diff options
| author | jerryshao <sshao@hortonworks.com> | 2015-12-15 18:24:23 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-12-15 18:24:23 -0800 |
| commit | 63ccdef81329e785807f37b4e918a9247fc70e3c (patch) | |
| tree | 593d610979db1106498066faf821bf6839508060 /core/src/main/scala/org/apache | |
| parent | 765a488494dac0ed38d2b81742c06467b79d96b2 (diff) | |
| download | spark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.gz spark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.bz2 spark-63ccdef81329e785807f37b4e918a9247fc70e3c.zip | |
[SPARK-10123][DEPLOY] Support specifying deploy mode from configuration
Please help to review, thanks a lot.
Author: jerryshao <sshao@hortonworks.com>
Closes #10195 from jerryshao/SPARK-10123.
Diffstat (limited to 'core/src/main/scala/org/apache')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index 18a1c52ae5..915ef81b4e 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -176,7 +176,10 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S packages = Option(packages).orElse(sparkProperties.get("spark.jars.packages")).orNull packagesExclusions = Option(packagesExclusions) .orElse(sparkProperties.get("spark.jars.excludes")).orNull - deployMode = Option(deployMode).orElse(env.get("DEPLOY_MODE")).orNull + deployMode = Option(deployMode) + .orElse(sparkProperties.get("spark.submit.deployMode")) + .orElse(env.get("DEPLOY_MODE")) + .orNull numExecutors = Option(numExecutors) .getOrElse(sparkProperties.get("spark.executor.instances").orNull) keytab = Option(keytab).orElse(sparkProperties.get("spark.yarn.keytab")).orNull |