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 <and...@databricks.com> Authored: Fri Dec 18 16:22:33 2015 -0800 Committer: Andrew Or <and...@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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
