Skip to content

[SPARK-23640][CORE] Fix hadoop config may override spark config #20785

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
wangyum wants to merge 4 commits into from
Closed

[SPARK-23640][CORE] Fix hadoop config may override spark config #20785

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9745ec3
Fix hadoop config may override spark config
wangyum Mar 9, 2018
0034a58
Change Utils.getSparkOrYarnConfig
wangyum Mar 10, 2018
06bb6f8
Change getSparkOrYarnConfig value order
wangyum Mar 17, 2018
a1eb874
Update scaladoc
wangyum Mar 30, 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
Next Next commit
Fix hadoop config may override spark config
  • Loading branch information
@wangyum
wangyum committed Mar 9, 2018
commit 9745ec3a61c99be59ef6a9d5eebd445e8af65b7a
10 changes: 7 additions & 3 deletions core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,13 @@ object SparkHadoopUtil {
}

private def appendSparkHadoopConfigs(conf: SparkConf, hadoopConf: Configuration): Unit = {
// Copy any "spark.hadoop.foo=bar" spark properties into conf as "foo=bar"
for ((key, value) <- conf.getAll if key.startsWith("spark.hadoop.")) {
hadoopConf.set(key.substring("spark.hadoop.".length), value)
for ((key, value) <- conf.getAll if key.startsWith("spark.")) {
if (key.startsWith("spark.hadoop.")) {
// Copy any "spark.hadoop.foo=bar" system properties into conf as "foo=bar"
hadoopConf.set(key.substring("spark.hadoop.".length), value)
} else {
hadoopConf.set(key, value)
}
}
}
}