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
Prev Previous commit
Next Next commit
Change getSparkOrYarnConfig value order
  • Loading branch information
@wangyum
wangyum committed Mar 17, 2018
commit 06bb6f8a7df62bbf9fc579c2130b6a8a32b326e9
10 changes: 5 additions & 5 deletions core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,12 +2433,12 @@ private[spark] object Utils extends Logging {
* if the key is not set in the Hadoop configuration.
*/
def getSparkOrYarnConfig(conf: SparkConf, key: String, default: String): String = {
val sparkValue = conf.get(key, default)
if (conf.get(SparkLauncher.SPARK_MASTER, null) == "yarn"
&& (key.startsWith("spark.hadoop.") || !key.startsWith("spark."))) {
new YarnConfiguration(SparkHadoopUtil.get.newConfiguration(conf)).get(key, sparkValue)
if (conf.contains(key)) {
Copy link
Contributor

@vanzin vanzin Mar 29, 2018

Choose a reason for hiding this comment

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

The scaladoc above is now wrong, since it still refers to the old order of precedence. Otherwise looks ok.

conf.get(key, default)
} else if (conf.get(SparkLauncher.SPARK_MASTER, null) == "yarn") {
new YarnConfiguration(SparkHadoopUtil.get.newConfiguration(conf)).get(key, default)
} else {
sparkValue
default
}
}

Expand Down