diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-07-25 14:53:21 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-07-25 14:53:21 -0700 |
| commit | f3cf09491a2b63e19a15e98cf815da503e4fb69b (patch) | |
| tree | ed5315015b01ecfa9fb78034aa48752d8fa29674 | |
| parent | 8eb8b52997da56acb3500fa48aac1ab9a3dfdddf (diff) | |
| parent | a6de90c927e5569e30a7bc6188253bd14c32c3a9 (diff) | |
| download | spark-f3cf09491a2b63e19a15e98cf815da503e4fb69b.tar.gz spark-f3cf09491a2b63e19a15e98cf815da503e4fb69b.tar.bz2 spark-f3cf09491a2b63e19a15e98cf815da503e4fb69b.zip | |
Merge pull request #734 from woggle/executor-env2
Get more env vars from driver rather than worker
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala index 8b51ff1c3a..47d3390928 100644 --- a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala +++ b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala @@ -51,6 +51,9 @@ private[spark] class ExecutorRunner( var process: Process = null var shutdownHook: Thread = null + private def getAppEnv(key: String): Option[String] = + appDesc.command.environment.get(key).orElse(Option(getenv(key))) + def start() { workerThread = new Thread("ExecutorRunner for " + fullId) { override def run() { fetchAndRunExecutor() } @@ -95,7 +98,7 @@ private[spark] class ExecutorRunner( def buildCommandSeq(): Seq[String] = { val command = appDesc.command - val runner = Option(getenv("JAVA_HOME")).map(_ + "/bin/java").getOrElse("java") + val runner = getAppEnv("JAVA_HOME").map(_ + "/bin/java").getOrElse("java") // SPARK-698: do not call the run.cmd script, as process.destroy() // fails to kill a process tree on Windows Seq(runner) ++ buildJavaOpts() ++ Seq(command.mainClass) ++ @@ -107,10 +110,10 @@ private[spark] class ExecutorRunner( * the way the JAVA_OPTS are assembled there. */ def buildJavaOpts(): Seq[String] = { - val libraryOpts = Option(getenv("SPARK_LIBRARY_PATH")) + val libraryOpts = getAppEnv("SPARK_LIBRARY_PATH") .map(p => List("-Djava.library.path=" + p)) .getOrElse(Nil) - val userOpts = Option(getenv("SPARK_JAVA_OPTS")).map(Utils.splitCommandString).getOrElse(Nil) + val userOpts = getAppEnv("SPARK_JAVA_OPTS").map(Utils.splitCommandString).getOrElse(Nil) val memoryOpts = Seq("-Xms" + memory + "M", "-Xmx" + memory + "M") // Figure out our classpath with the external compute-classpath script |