Github user berngp commented on a diff in the pull request:
https://github.com/apache/spark/pull/433#discussion_r11763040
--- Diff:
yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala ---
@@ -378,55 +378,48 @@ object ClientBase {
val APP_JAR: String = "app.jar"
val LOG4J_PROP: String = "log4j.properties"
- // Based on code from org.apache.hadoop.mapreduce.v2.util.MRApps
- def populateHadoopClasspath(conf: Configuration, env: HashMap[String,
String]) {
- val classpathEntries = Option(conf.getStrings(
- YarnConfiguration.YARN_APPLICATION_CLASSPATH)).getOrElse(
- getDefaultYarnApplicationClasspath())
- for (c <- classpathEntries) {
- YarnSparkHadoopUtil.addToEnvironment(env,
Environment.CLASSPATH.name, c.trim,
- File.pathSeparator)
- }
+ def populateHadoopClasspath(conf: Configuration, env: HashMap[String,
String]) = {
+ val classPathElementsToAdd = getYarnAppClasspath(conf) ++
getMRAppClasspath(conf)
+ addToAppClasspath(env, classPathElementsToAdd)
+ classPathElementsToAdd
+ }
- val mrClasspathEntries = Option(conf.getStrings(
- "mapreduce.application.classpath")).getOrElse(
- getDefaultMRApplicationClasspath())
- if (mrClasspathEntries != null) {
- for (c <- mrClasspathEntries) {
- YarnSparkHadoopUtil.addToEnvironment(env,
Environment.CLASSPATH.name, c.trim,
- File.pathSeparator)
- }
- }
+ protected[yarn] def getYarnAppClasspath(conf: Configuration) =
+ getAppClasspathForKey(YarnConfiguration.YARN_APPLICATION_CLASSPATH,
conf)(getDefaultYarnApplicationClasspath)
+
+ protected[yarn] def getMRAppClasspath(conf: Configuration) =
+ getAppClasspathForKey("mapreduce.application.classpath",
conf)(getDefaultMRApplicationClasspath)
+
+ protected[yarn] def addToAppClasspath(env: HashMap[String, String],
elements : Iterable[String]) {
+ for ( c <- elements )
+ yield (YarnSparkHadoopUtil.addToEnvironment(env,
Environment.CLASSPATH.name, c.trim, File.pathSeparator))
}
- def getDefaultYarnApplicationClasspath(): Array[String] = {
- try {
- val field =
classOf[MRJobConfig].getField("DEFAULT_YARN_APPLICATION_CLASSPATH")
- field.get(null).asInstanceOf[Array[String]]
- } catch {
- case err: NoSuchFieldError => null
- case err: NoSuchFieldException => null
+ protected[yarn] def getAppClasspathForKey(key:String, conf:Configuration)
+ (f: => Array[String]) :
Array[String] =
+ Option(conf.getStrings(key)) match {
+ case Some(s) => s
+ case None => f
--- End diff --
I inlined the function, had to keep the match since the `getOrElse` was
giving me some trouble with the types.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
