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
Update scaladoc
  • Loading branch information
@wangyum
wangyum committed Mar 30, 2018
commit a1eb874a528b95f545e8f9405d5e36a7e85f33d4
9 changes: 6 additions & 3 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 @@ -2428,9 +2428,12 @@ private[spark] object Utils extends Logging {
}

/**
* Return the value of a config either through the SparkConf or the Hadoop configuration
* if this is Yarn mode. In the latter case, this defaults to the value set through SparkConf
* if the key is not set in the Hadoop configuration.
* Return the value of a config either through the SparkConf or the Hadoop configuration.
* We Check whether the key is set in the SparkConf before look at any Hadoop configuration.
* If the key is set in SparkConf, no matter whether it is running on YARN or not,
* gets the value from SparkConf.
* Only when the key is not set in SparkConf and running on YARN,
* gets the value from Hadoop configuration.
*/
def getSparkOrYarnConfig(conf: SparkConf, key: String, default: String): String = {
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.

Expand Down