diff options
| author | Andrew Or <andrew@databricks.com> | 2015-12-18 16:22:33 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-12-18 16:22:33 -0800 |
| commit | 14be5dece291c900bf97d87b850d906717645fd4 (patch) | |
| tree | 576f9b3c21a6c9272f5002603f5ce1b399a7e8f9 | |
| parent | ba9332edd889730c906404041bc83b1643d80961 (diff) | |
| download | spark-14be5dece291c900bf97d87b850d906717645fd4.tar.gz spark-14be5dece291c900bf97d87b850d906717645fd4.tar.bz2 spark-14be5dece291c900bf97d87b850d906717645fd4.zip | |
Revert "[SPARK-12413] Fix Mesos ZK persistence"
This reverts commit 2bebaa39d9da33bc93ef682959cd42c1968a6a3e.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 6 |
1 files changed, 1 insertions, 5 deletions
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 87d0fa8b52..c0b9359650 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 |