diff options
| author | Kanwaljit Singh <kanwaljit.singh@guavus.com> | 2014-12-19 19:25:39 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-12-19 19:28:07 -0800 |
| commit | a1a1361a9398a837129b87848e2cc3ae5acf6cf7 (patch) | |
| tree | 3f8d7abfaaca533cb8d91a9ab4bb76be45b8538a /core/src | |
| parent | 4da1039840182e8e8bc836b89cda7b77fe7356d9 (diff) | |
| download | spark-a1a1361a9398a837129b87848e2cc3ae5acf6cf7.tar.gz spark-a1a1361a9398a837129b87848e2cc3ae5acf6cf7.tar.bz2 spark-a1a1361a9398a837129b87848e2cc3ae5acf6cf7.zip | |
SPARK-2641: Passing num executors to spark arguments from properties file
Since we can set spark executor memory and executor cores using property file, we must also be allowed to set the executor instances.
Author: Kanwaljit Singh <kanwaljit.singh@guavus.com>
Closes #1657 from kjsingh/branch-1.0 and squashes the following commits:
d8a5a12 [Kanwaljit Singh] SPARK-2641: Fixing how spark arguments are loaded from properties file for num executors
Conflicts:
core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 |
1 files changed, 2 insertions, 0 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 f0e9ee67f6..958bd03617 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -120,6 +120,8 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St name = Option(name).orElse(sparkProperties.get("spark.app.name")).orNull jars = Option(jars).orElse(sparkProperties.get("spark.jars")).orNull deployMode = Option(deployMode).orElse(env.get("DEPLOY_MODE")).orNull + numExecutors = Option(numExecutors) + .getOrElse(defaultProperties.get("spark.executor.instances").orNull) // Try to set main class from JAR if no --class argument is given if (mainClass == null && !isPython && primaryResource != null) { |