Revert "[SPARK-12345][MESOS] Filter SPARK_HOME when submitting Spark jobs with Mesos cluster mode."
This reverts commit ad8c1f0b840284d05da737fb2cc5ebf8848f4490. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a78a91f4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a78a91f4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a78a91f4 Branch: refs/heads/master Commit: a78a91f4d7239c14bd5d0b18cdc87d55594a8d8a Parents: 8a9417b Author: Andrew Or <and...@databricks.com> Authored: Fri Dec 18 16:22:51 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Fri Dec 18 16:22:51 2015 -0800 ---------------------------------------------------------------------- .../org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 7 +------ .../spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a78a91f4/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala index 24510db..868cc35 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala @@ -94,12 +94,7 @@ private[mesos] class MesosSubmitRequestServlet( val driverMemory = sparkProperties.get("spark.driver.memory") val driverCores = sparkProperties.get("spark.driver.cores") val appArgs = request.appArgs - // We don't want to pass down SPARK_HOME when launching Spark apps - // with Mesos cluster mode since it's populated by default on the client and it will - // cause spark-submit script to look for files in SPARK_HOME instead. - // We only need the ability to specify where to find spark-submit script - // which user can user spark.executor.home or spark.home configurations. - val environmentVariables = request.environmentVariables.filter(!_.equals("SPARK_HOME")) + val environmentVariables = request.environmentVariables val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass) // Construct driver description http://git-wip-us.apache.org/repos/asf/spark/blob/a78a91f4/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala index 573355b..721861f 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala @@ -34,7 +34,7 @@ import org.apache.spark.util.Utils /** * Shared trait for implementing a Mesos Scheduler. This holds common state and helper - * methods the Mesos scheduler will use. + * methods and Mesos scheduler will use. */ private[mesos] trait MesosSchedulerUtils extends Logging { // Lock used to wait for scheduler to be registered --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
