Skip to content

Commit

Permalink
SPARK-2641: Fixing how spark arguments are loaded from properties fil…
Browse files Browse the repository at this point in the history
…e for num executors
  • Loading branch information
Kanwaljit Singh committed Jul 30, 2014
1 parent 3143e51 commit d8a5a12
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ private[spark] class SparkSubmitArguments(args: Seq[String]) {
.getOrElse(defaultProperties.get("spark.cores.max").orNull)
name = Option(name).getOrElse(defaultProperties.get("spark.app.name").orNull)
jars = Option(jars).getOrElse(defaultProperties.get("spark.jars").orNull)
numExecutors = Option(numExecutors)
.getOrElse(defaultProperties.get("spark.executor.instances").orNull)

// This supports env vars in older versions of Spark
master = Option(master).getOrElse(System.getenv("MASTER"))
Expand Down

0 comments on commit d8a5a12

Please sign in to comment.