Skip to content

[SPARK-12413] Fix Mesos ZK persistence #10366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mgummelt wants to merge 3 commits into from
Closed

[SPARK-12413] Fix Mesos ZK persistence #10366

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbfbbdf
[SPARK-12413] Fix Mesos ZK persistence
Dec 17, 2015
05c4da3
comment spacing and line length fix
Dec 17, 2015
d70bcee
use filter instead of filterKeys
Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/rest/mesos/MesosRestServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
// Due to https://issues.scala-lang.org/browse/SI-6654, `filterKeys` returns an
// unserializable object, so we must call `.map(identity)` on the result.
val environmentVariables = request.environmentVariables.filterKeys(!_.equals("SPARK_HOME"))
.map(identity)
Copy link
Contributor

@andrewor14 andrewor14 Dec 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, there's a slightly nicer way...

// Do not use `filterKeys` here to avoid SI-6654, which breaks ZK persistence
val environmentVariables = request.environmentVariables.filter { case (k, _) =>
  k != "SPARK_HOME"
}

so we don't have to do the weird filterKeys(...).map(identity) thing

Copy link
Author

@mgummelt mgummelt Dec 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's better. Fixed.

val name = request.sparkProperties.get("spark.app.name").getOrElse(mainClass)

// Construct driver description
Expand Down