Skip to content

[SPARK-22372][core, yarn] Make cluster submission use SparkApplication. #19631

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
vanzin wants to merge 11 commits into from
Closed

[SPARK-22372][core, yarn] Make cluster submission use SparkApplication. #19631

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c80554b
[SPARK-22372][core, yarn] Make cluster submission use SparkApplication.
Oct 30, 2017
cee6be2
Add mima excludes.
Nov 1, 2017
cb6c8ff
Remove stale comment.
Nov 7, 2017
593eb6b
Rename constants.
Nov 14, 2017
121bcf8
Correctly filter out SPARK_AUTH_SECRET_CONF.
Nov 15, 2017
08f47ca
Cleanup SPARK_YARN_MODE in tests.
Nov 15, 2017
2129ccb
Propagate secret to executors from AM to avoid writing it to disk.
Nov 16, 2017
86f0bf8
Unbreak test.
Nov 16, 2017
e8dc7ec
Merge branch 'master' into SPARK-22372
Nov 30, 2017
515f8f8
Feedback.
Nov 30, 2017
c752453
Go back to propagating secret using credentials.
Dec 1, 2017
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
Correctly filter out SPARK_AUTH_SECRET_CONF.
  • Loading branch information
Marcelo Vanzin committed Nov 15, 2017
commit 121bcf8a2758858cad8e88e7fb7d78566494765b
13 changes: 5 additions & 8 deletions resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,17 +742,14 @@ private[spark] class Client(
hadoopConf.writeXml(confStream)
confStream.closeEntry()

// Save Spark configuration to a file in the archive.
// Save Spark configuration to a file in the archive, but filter out the app's secret.
val props = new Properties()
sparkConf.getAll.foreach { case (k, v) => props.setProperty(k, v) }
sparkConf.getAll.foreach { case (k, v) if k != SecurityManager.SPARK_AUTH_SECRET_CONF =>
props.setProperty(k, v)
}
// Override spark.yarn.key to point to the location in distributed cache which will be used
// by AM.
Option(amKeytabFileName).foreach { k =>
// Do not propagate the app's secret using the config file.
if (k != SecurityManager.SPARK_AUTH_SECRET_CONF) {
props.setProperty(KEYTAB.key, k)
}
}
Option(amKeytabFileName).foreach { k => props.setProperty(KEYTAB.key, k) }
confStream.putNextEntry(new ZipEntry(SPARK_CONF_FILE))
val writer = new OutputStreamWriter(confStream, StandardCharsets.UTF_8)
props.store(writer, "Spark configuration.")
Expand Down