diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-01 12:27:50 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-01 12:27:50 -0700 |
| commit | a30fac16ca0525f2001b127e5f9518c9680844c9 (patch) | |
| tree | 73dc251817e1f3d5c51017ac3c5c582a6dc6f3f2 | |
| parent | 03cc76506ae84ded082b10384991a2a697ffb392 (diff) | |
| parent | 250bddc255b719dd9a39b6bb3f1e60574579f983 (diff) | |
| download | spark-a30fac16ca0525f2001b127e5f9518c9680844c9.tar.gz spark-a30fac16ca0525f2001b127e5f9518c9680844c9.tar.bz2 spark-a30fac16ca0525f2001b127e5f9518c9680844c9.zip | |
Merge pull request #883 from alig/master
Don't require the spark home environment variable to be set for standalone mode (change needed by SIMR)
| -rw-r--r-- | core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala index 42c3b4a6cf..7ac574bdc8 100644 --- a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala +++ b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala @@ -46,8 +46,7 @@ private[spark] class SparkDeploySchedulerBackend( StandaloneSchedulerBackend.ACTOR_NAME) val args = Seq(driverUrl, "{{EXECUTOR_ID}}", "{{HOSTNAME}}", "{{CORES}}") val command = Command("spark.executor.StandaloneExecutorBackend", args, sc.executorEnvs) - val sparkHome = sc.getSparkHome().getOrElse( - throw new IllegalArgumentException("must supply spark home for spark standalone")) + val sparkHome = sc.getSparkHome().getOrElse(null) val appDesc = new ApplicationDescription(appName, maxCores, executorMemory, command, sparkHome, sc.ui.appUIAddress) |