diff options
| author | Y.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.(none)> | 2013-07-02 21:18:59 -0500 |
|---|---|---|
| committer | Y.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.(none)> | 2013-07-02 21:18:59 -0500 |
| commit | 923cf929003c67963e273fcdcd5b01baf68df8b5 (patch) | |
| tree | 7049909ae9f19e9a22382e584c43dd8e3c4f2a8b /core/src/hadoop1/scala | |
| parent | bad51c7cb4e15b68ce49ac4886e4631b9fb7e308 (diff) | |
| download | spark-923cf929003c67963e273fcdcd5b01baf68df8b5.tar.gz spark-923cf929003c67963e273fcdcd5b01baf68df8b5.tar.bz2 spark-923cf929003c67963e273fcdcd5b01baf68df8b5.zip | |
Rework from pull request. Removed --user option from Spark on Yarn Client, made the user of JAVA_HOME environment
variable conditional on if its set, and created addCredentials in each of the SparkHadoopUtil classes
to only add the credentials when the profile is hadoop2-yarn.
Diffstat (limited to 'core/src/hadoop1/scala')
| -rw-r--r-- | core/src/hadoop1/scala/spark/deploy/SparkHadoopUtil.scala | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/src/hadoop1/scala/spark/deploy/SparkHadoopUtil.scala b/core/src/hadoop1/scala/spark/deploy/SparkHadoopUtil.scala index a0fb4fe25d..f1c86de4cc 100644 --- a/core/src/hadoop1/scala/spark/deploy/SparkHadoopUtil.scala +++ b/core/src/hadoop1/scala/spark/deploy/SparkHadoopUtil.scala @@ -1,5 +1,6 @@ package spark.deploy import org.apache.hadoop.conf.Configuration +import org.apache.hadoop.mapred.JobConf /** @@ -20,4 +21,7 @@ object SparkHadoopUtil { // Return an appropriate (subclass) of Configuration. Creating config can initializes some hadoop subsystems def newConfiguration(): Configuration = new Configuration() + + // add any user credentials to the job conf which are necessary for running on a secure Hadoop cluster + def addCredentials(conf: JobConf) {} } |