minor changes

mengxr · mengxr · commit 11e535434940 · 2014-05-21T11:45:25.000-07:00
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -220,7 +220,7 @@ trait ClientBase extends Logging {
       }
     }
 
-    var cachedJarLinks = ListBuffer.empty[String]
+    var cachedSecondaryJarLinks = ListBuffer.empty[String]
     val fileLists = List( (args.addJars, LocalResourceType.FILE, true),
       (args.files, LocalResourceType.FILE, false),
       (args.archives, LocalResourceType.ARCHIVE, false) )
@@ -235,13 +235,13 @@ trait ClientBase extends Logging {
             distCacheMgr.addResource(fs, conf, destPath, localResources, resType,
               linkname, statCache)
             if (addToClasspath) {
-              cachedJarLinks += linkname
+              cachedSecondaryJarLinks += linkname
             }
           }
         }
       }
     }
-    sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))
+    sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedSecondaryJarLinks.mkString(","))
 
     UserGroupInformation.getCurrentUser().addCredentials(credentials)
     localResources
@@ -485,18 +485,19 @@ object ClientBase {
 
     extraClassPath.foreach(addClasspathEntry)
 
-    val localSecondaryJarLinks = sparkConf.getOption(CONF_SPARK_YARN_SECONDARY_JARS).getOrElse("").split(",")
+    val cachedSecondaryJarLinks =
+      sparkConf.getOption(CONF_SPARK_YARN_SECONDARY_JARS).getOrElse("").split(",")
     // Normally the users app.jar is last in case conflicts with spark jars
     if (sparkConf.get("spark.yarn.user.classpath.first", "false").toBoolean) {
       addPwdClasspathEntry(APP_JAR)
-      localSecondaryJarLinks.foreach(addPwdClasspathEntry)
+      cachedSecondaryJarLinks.foreach(addPwdClasspathEntry)
       addPwdClasspathEntry(SPARK_JAR)
       ClientBase.populateHadoopClasspath(conf, env)
     } else {
       addPwdClasspathEntry(SPARK_JAR)
       ClientBase.populateHadoopClasspath(conf, env)
       addPwdClasspathEntry(APP_JAR)
-      localSecondaryJarLinks.foreach(addPwdClasspathEntry)
+      cachedSecondaryJarLinks.foreach(addPwdClasspathEntry)
     }
     addPwdClasspathEntry("*")
   }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ trait ClientBase extends Logging {`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- var cachedJarLinks = ListBuffer.empty[String]`
	`223`	`+ var cachedSecondaryJarLinks = ListBuffer.empty[String]`
`224`	`224`	`val fileLists = List( (args.addJars, LocalResourceType.FILE, true),`
`225`	`225`	`(args.files, LocalResourceType.FILE, false),`
`226`	`226`	`(args.archives, LocalResourceType.ARCHIVE, false) )`
`@@ -235,13 +235,13 @@ trait ClientBase extends Logging {`
`235`	`235`	`distCacheMgr.addResource(fs, conf, destPath, localResources, resType,`
`236`	`236`	`linkname, statCache)`
`237`	`237`	`if (addToClasspath) {`
`238`		`- cachedJarLinks += linkname`
	`238`	`+ cachedSecondaryJarLinks += linkname`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`}`
`244`		`- sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))`
	`244`	`+ sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedSecondaryJarLinks.mkString(","))`
`245`	`245`
`246`	`246`	`UserGroupInformation.getCurrentUser().addCredentials(credentials)`
`247`	`247`	`localResources`
`@@ -485,18 +485,19 @@ object ClientBase {`
`485`	`485`
`486`	`486`	`extraClassPath.foreach(addClasspathEntry)`
`487`	`487`
`488`		`- val localSecondaryJarLinks = sparkConf.getOption(CONF_SPARK_YARN_SECONDARY_JARS).getOrElse("").split(",")`
	`488`	`+ val cachedSecondaryJarLinks =`
	`489`	`+ sparkConf.getOption(CONF_SPARK_YARN_SECONDARY_JARS).getOrElse("").split(",")`
`489`	`490`	`// Normally the users app.jar is last in case conflicts with spark jars`
`490`	`491`	`if (sparkConf.get("spark.yarn.user.classpath.first", "false").toBoolean) {`
`491`	`492`	`addPwdClasspathEntry(APP_JAR)`
`492`		`- localSecondaryJarLinks.foreach(addPwdClasspathEntry)`
	`493`	`+ cachedSecondaryJarLinks.foreach(addPwdClasspathEntry)`
`493`	`494`	`addPwdClasspathEntry(SPARK_JAR)`
`494`	`495`	`ClientBase.populateHadoopClasspath(conf, env)`
`495`	`496`	`} else {`
`496`	`497`	`addPwdClasspathEntry(SPARK_JAR)`
`497`	`498`	`ClientBase.populateHadoopClasspath(conf, env)`
`498`	`499`	`addPwdClasspathEntry(APP_JAR)`
`499`		`- localSecondaryJarLinks.foreach(addPwdClasspathEntry)`
	`500`	`+ cachedSecondaryJarLinks.foreach(addPwdClasspathEntry)`
`500`	`501`	`}`
`501`	`502`	`addPwdClasspathEntry("*")`
`502`	`503`	`}`