diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-26 11:13:33 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-26 11:13:33 -0700 |
| commit | e49bc8ca8c411aa693f85c1ef3d23ea42d488c4d (patch) | |
| tree | df55f0be5b0c71cf94a1a4d1a0e2a4921988d16b | |
| parent | 32370da4e40062b88c921417cd7418d804e16f23 (diff) | |
| parent | d7011632d15b6de2129d360277e304fddb8f2aac (diff) | |
| download | spark-e49bc8ca8c411aa693f85c1ef3d23ea42d488c4d.tar.gz spark-e49bc8ca8c411aa693f85c1ef3d23ea42d488c4d.tar.bz2 spark-e49bc8ca8c411aa693f85c1ef3d23ea42d488c4d.zip | |
Merge pull request #663 from stephenh/option_and_getenv
Be cute with Option and getenv.
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala index 4f8e1dcb26..d7f58b2cb1 100644 --- a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala +++ b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala @@ -1,6 +1,7 @@ package spark.deploy.worker import java.io._ +import java.lang.System.getenv import spark.deploy.{ExecutorState, ExecutorStateChanged, ApplicationDescription} import akka.actor.ActorRef import spark.{Utils, Logging} @@ -77,11 +78,7 @@ private[spark] class ExecutorRunner( def buildCommandSeq(): Seq[String] = { val command = appDesc.command - val runner = if (System.getenv("JAVA_HOME") == null) { - "java" - } else { - System.getenv("JAVA_HOME") + "/bin/java" - } + val runner = Option(getenv("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) ++ @@ -93,18 +90,10 @@ private[spark] class ExecutorRunner( * the way the JAVA_OPTS are assembled there. */ def buildJavaOpts(): Seq[String] = { - val libraryOpts = if (System.getenv("SPARK_LIBRARY_PATH") == null) { - Nil - } else { - List("-Djava.library.path=" + System.getenv("SPARK_LIBRARY_PATH")) - } - - val userOpts = if (System.getenv("SPARK_JAVA_OPTS") == null) { - Nil - } else { - Utils.splitCommandString(System.getenv("SPARK_JAVA_OPTS")) - } - + val libraryOpts = Option(getenv("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 memoryOpts = Seq("-Xms" + memory + "M", "-Xmx" + memory + "M") // Figure out our classpath with the external compute-classpath script |