diff options
| author | Andrew Or <andrewor14@gmail.com> | 2014-09-18 17:49:28 -0700 |
|---|---|---|
| committer | Andrew Or <andrewor14@gmail.com> | 2014-09-18 17:49:28 -0700 |
| commit | 9306297d1d888d0430f79b2133ee7377871a3a18 (patch) | |
| tree | 70270623ab776db902f6bafb185dc3884deb142a /core | |
| parent | b3ed37e5bad15d56db90c2b25fe11c1f758d3a97 (diff) | |
| download | spark-9306297d1d888d0430f79b2133ee7377871a3a18.tar.gz spark-9306297d1d888d0430f79b2133ee7377871a3a18.tar.bz2 spark-9306297d1d888d0430f79b2133ee7377871a3a18.zip | |
[Minor Hot Fix] Move a line in SparkSubmit to the right place
This was introduced in #2449
Author: Andrew Or <andrewor14@gmail.com>
Closes #2452 from andrewor14/standalone-hot-fix and squashes the following commits:
d5190ca [Andrew Or] Put that line in the right place
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index ec0324e249..d132ecb3f9 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -183,6 +183,7 @@ object SparkSubmit { sysProp = "spark.driver.extraLibraryPath"), // Standalone cluster only + OptionAssigner(args.jars, STANDALONE, CLUSTER, sysProp = "spark.jars"), OptionAssigner(args.driverMemory, STANDALONE, CLUSTER, clOption = "--memory"), OptionAssigner(args.driverCores, STANDALONE, CLUSTER, clOption = "--cores"), @@ -205,7 +206,6 @@ object SparkSubmit { OptionAssigner(args.jars, YARN, CLUSTER, clOption = "--addJars"), // Other options - OptionAssigner(args.jars, STANDALONE, CLUSTER, sysProp = "spark.jars"), OptionAssigner(args.executorMemory, STANDALONE | MESOS | YARN, ALL_DEPLOY_MODES, sysProp = "spark.executor.memory"), OptionAssigner(args.totalExecutorCores, STANDALONE | MESOS, ALL_DEPLOY_MODES, |