Skip to content

[SPARK-25934] [Mesos] Don't propagate SPARK_CONF_DIR from spark submit #22937

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
mpmolek wants to merge 5 commits into from
Closed

[SPARK-25934] [Mesos] Don't propagate SPARK_CONF_DIR from spark submit #22937

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10da112
[SPARK-25934] Don't propagate SPARK_CONF_DIR from spark submit
mpmolek Nov 3, 2018
2a1f312
Add tests for env var filters
mpmolek Nov 6, 2018
6ac6d7d
Put blacklisted env vars in a set
mpmolek Nov 6, 2018
d10c7a2
Re-arrange comments
mpmolek Nov 6, 2018
b500199
Whitespace
mpmolek Nov 6, 2018
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
Prev Previous commit
Next Next commit
Add tests for env var filters
  • Loading branch information
@mpmolek
mpmolek committed Nov 6, 2018
commit 2a1f3127a701a6a2fad915b5fde0985ce30ef2a1
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@ private[spark] object RestSubmissionClient {
*/
private[rest] def filterSystemEnvironment(env: Map[String, String]): Map[String, String] = {
env.filterKeys { k =>
// SPARK_HOME is filtered out because it is usually wrong on the remote machine (SPARK-12345)
// SPARK_HOME and SPARK_CONF_DIR are filtered out because they are usually wrong
// on the remote machine (SPARK-12345) (SPARK-25934)
(k.startsWith("SPARK_") && k != "SPARK_ENV_LOADED" && k != "SPARK_HOME"
&& k != "SPARK_CONF_DIR") || k.startsWith("MESOS_")
Copy link
Member

@dongjoon-hyun dongjoon-hyun Nov 6, 2018

Choose a reason for hiding this comment

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

Could you add a test case in StandaloneRestSubmitSuite.scala in order to prevent a future regression?

Copy link
Contributor Author

@mpmolek mpmolek Nov 6, 2018

Choose a reason for hiding this comment

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

Sure, good idea. I also added a test for filtering "SPARK_HOME" which didn't get a test back when that filter was added.

}
Expand Down
12 changes: 12 additions & 0 deletions core/src/test/scala/org/apache/spark/deploy/rest/StandaloneRestSubmitSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,18 @@ class StandaloneRestSubmitSuite extends SparkFunSuite with BeforeAndAfterEach {
assert(filteredVariables == Map("SPARK_VAR" -> "1"))
}

test("client does not send 'SPARK_HOME' env var by default") {
val environmentVariables = Map("SPARK_VAR" -> "1", "SPARK_HOME" -> "1")
val filteredVariables = RestSubmissionClient.filterSystemEnvironment(environmentVariables)
assert(filteredVariables == Map("SPARK_VAR" -> "1"))
}

test("client does not send 'SPARK_CONF_DIR' env var by default") {
val environmentVariables = Map("SPARK_VAR" -> "1", "SPARK_CONF_DIR" -> "1")
val filteredVariables = RestSubmissionClient.filterSystemEnvironment(environmentVariables)
assert(filteredVariables == Map("SPARK_VAR" -> "1"))
}

test("client includes mesos env vars") {
val environmentVariables = Map("SPARK_VAR" -> "1", "MESOS_VAR" -> "1", "OTHER_VAR" -> "1")
val filteredVariables = RestSubmissionClient.filterSystemEnvironment(environmentVariables)
Expand Down