You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sa...@apache.org on 2015/12/18 12:18:08 UTC
spark git commit: [SPARK-12413] Fix Mesos ZK persistence
Repository: spark
Updated Branches:
refs/heads/master 40e52a27c -> 2bebaa39d
[SPARK-12413] Fix Mesos ZK persistence
I believe this fixes SPARK-12413. I'm currently running an integration test to verify.
Author: Michael Gummelt <mg...@mesosphere.io>
Closes #10366 from mgummelt/fix-zk-mesos.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2bebaa39
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2bebaa39
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2bebaa39
Branch: refs/heads/master
Commit: 2bebaa39d9da33bc93ef682959cd42c1968a6a3e
Parents: 40e52a2
Author: Michael Gummelt <mg...@mesosphere.io>
Authored: Fri Dec 18 20:18:00 2015 +0900
Committer: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Committed: Fri Dec 18 20:18:00 2015 +0900
----------------------------------------------------------------------
.../org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2bebaa39/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..87d0fa8 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,11 @@ 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"))
+ //
+ // Do not use `filterKeys` here to avoid SI-6654, which breaks ZK persistence
+ val environmentVariables = request.environmentVariables.filter { case (k, _) =>
+ k != "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