spark-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sryza <...@git.apache.org>
Subject [GitHub] spark pull request: SPARK-1064
Date Tue, 11 Mar 2014 15:36:56 GMT
Github user sryza commented on a diff in the pull request:

    https://github.com/apache/spark/pull/102#discussion_r10478785
  
    --- Diff: yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala ---
    @@ -379,7 +381,17 @@ object ClientBase {
     
       // Based on code from org.apache.hadoop.mapreduce.v2.util.MRApps
       def populateHadoopClasspath(conf: Configuration, env: HashMap[String, String]) {
    -    for (c <- conf.getStrings(YarnConfiguration.YARN_APPLICATION_CLASSPATH)) {
    +    val classpathEntries = Option(conf.getStrings(
    +      YarnConfiguration.YARN_APPLICATION_CLASSPATH)).getOrElse(
    +        YarnConfiguration.DEFAULT_YARN_APPLICATION_CLASSPATH)
    +    for (c <- classpathEntries) {
    +      Apps.addToEnvironment(env, Environment.CLASSPATH.name, c.trim)
    +    }
    +
    +    val mrClasspathEntries = Option(conf.getStrings(
    +      MRJobConfig.MAPREDUCE_APPLICATION_CLASSPATH)).getOrElse(
    +        StringUtils.getStrings(MRJobConfig.DEFAULT_MAPREDUCE_APPLICATION_CLASSPATH))
    --- End diff --
    
    Oy, good point.  In the 2.0 line (which CDH4 is based off of) it's an array of Strings,
and in 2.2/GA is's a String.  And in the 0.23 line, it doesn't exist at all.  


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message