diff options
| author | huangzhaowei <carlmartinmax@gmail.com> | 2014-12-19 23:32:56 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-12-19 23:33:19 -0800 |
| commit | 4346a2ba1a1c62732c5e313b464019fe6259a4a8 (patch) | |
| tree | 146b57b444bc849520db4f4d5fb354c8af3d8984 /core | |
| parent | 96d5b00ac27a203a5fe973f4e2e3031e602149ba (diff) | |
| download | spark-4346a2ba1a1c62732c5e313b464019fe6259a4a8.tar.gz spark-4346a2ba1a1c62732c5e313b464019fe6259a4a8.tar.bz2 spark-4346a2ba1a1c62732c5e313b464019fe6259a4a8.zip | |
[Minor] Build Failed: value defaultProperties not found
Mvn Build Failed: value defaultProperties not found .Maybe related to this pr:
https://github.com/apache/spark/commit/1d648123a77bbcd9b7a34cc0d66c14fa85edfecd
andrewor14 can you look at this problem?
Author: huangzhaowei <carlmartinmax@gmail.com>
Closes #3749 from SaintBacchus/Mvn-Build-Fail and squashes the following commits:
8e2917c [huangzhaowei] Build Failed: value defaultProperties not found
(cherry picked from commit a764960b3b6d842eef7fa4777c8fa99d3f60fa1e)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 2 |
1 files changed, 1 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 958bd03617..607b4df73d 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -121,7 +121,7 @@ private[spark] class SparkSubmitArguments(args: Seq[String], env: Map[String, St 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) + .getOrElse(sparkProperties.get("spark.executor.instances").orNull) // Try to set main class from JAR if no --class argument is given if (mainClass == null && !isPython && primaryResource != null) { |