You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/12/19 01:23:00 UTC
[1/3] spark git commit: Revert "[SPARK-12413] Fix Mesos ZK
persistence"
Repository: spark
Updated Branches:
refs/heads/master ba9332edd -> a78a91f4d
Revert "[SPARK-12413] Fix Mesos ZK persistence"
This reverts commit 2bebaa39d9da33bc93ef682959cd42c1968a6a3e.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/14be5dec
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/14be5dec
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/14be5dec
Branch: refs/heads/master
Commit: 14be5dece291c900bf97d87b850d906717645fd4
Parents: ba9332e
Author: Andrew Or <an...@databricks.com>
Authored: Fri Dec 18 16:22:33 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Fri Dec 18 16:22:33 2015 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/14be5dec/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 87d0fa8..c0b9359 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
@@ -99,11 +99,7 @@ private[mesos] class MesosSubmitRequestServlet(
// 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.
- //
- // Do not use `filterKeys` here to avoid SI-6654, which breaks ZK persistence
- val environmentVariables = request.environmentVariables.filter { case (k, _) =>
- k != "SPARK_HOME"
- }
+ val environmentVariables = request.environmentVariables.filterKeys(!_.equals("SPARK_HOME"))
val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass)
// Construct driver description
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[2/3] spark git commit: Revert "[SPARK-12345][MESOS] Properly filter
out SPARK_HOME in the Mesos REST server"
Posted by an...@apache.org.
Revert "[SPARK-12345][MESOS] Properly filter out SPARK_HOME in the Mesos REST server"
This reverts commit 8184568810e8a2e7d5371db2c6a0366ef4841f70.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8a9417bc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8a9417bc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8a9417bc
Branch: refs/heads/master
Commit: 8a9417bc4b227c57bdb0a5a38a225dbdf6e69f64
Parents: 14be5de
Author: Andrew Or <an...@databricks.com>
Authored: Fri Dec 18 16:22:41 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Fri Dec 18 16:22:41 2015 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/8a9417bc/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 c0b9359..24510db 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
@@ -99,7 +99,7 @@ private[mesos] class MesosSubmitRequestServlet(
// 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.filterKeys(!_.equals("SPARK_HOME"))
+ val environmentVariables = request.environmentVariables.filter(!_.equals("SPARK_HOME"))
val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass)
// Construct driver description
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[3/3] spark git commit: Revert "[SPARK-12345][MESOS] Filter
SPARK_HOME when submitting Spark jobs with Mesos cluster mode."
Posted by an...@apache.org.
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 <an...@databricks.com>
Authored: Fri Dec 18 16:22:51 2015 -0800
Committer: Andrew Or <an...@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-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org