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)
This commit is contained in:
Matei Zaharia 2013-09-01 12:27:50 -07:00
Родитель 03cc76506a 250bddc255
Коммит a30fac16ca
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -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)