diff options
| author | Michael Gummelt <mgummelt@mesosphere.io> | 2015-12-18 20:18:00 +0900 |
|---|---|---|
| committer | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2015-12-18 20:18:00 +0900 |
| commit | 2bebaa39d9da33bc93ef682959cd42c1968a6a3e (patch) | |
| tree | 1771442e87d17a0935ed98e6bcd5a2622d78ca88 /core | |
| parent | 40e52a27c74259237dd1906c0e8b54d2ae645dfb (diff) | |
| download | spark-2bebaa39d9da33bc93ef682959cd42c1968a6a3e.tar.gz spark-2bebaa39d9da33bc93ef682959cd42c1968a6a3e.tar.bz2 spark-2bebaa39d9da33bc93ef682959cd42c1968a6a3e.zip | |
[SPARK-12413] Fix Mesos ZK persistence
I believe this fixes SPARK-12413. I'm currently running an integration test to verify.
Author: Michael Gummelt <mgummelt@mesosphere.io>
Closes #10366 from mgummelt/fix-zk-mesos.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala | 6 |
1 files changed, 5 insertions, 1 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 c0b9359650..87d0fa8b52 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 |