use sparkConf instead of hadoop conf

mengxr · mengxr · commit 3e7e1c4a2fe1 · 2014-05-21T11:21:09.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
@@ -241,7 +241,7 @@ trait ClientBase extends Logging {
         }
       }
     }
-    conf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))
+    sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))
 
     UserGroupInformation.getCurrentUser().addCredentials(credentials)
     localResources
@@ -485,7 +485,7 @@ object ClientBase {
 
     extraClassPath.foreach(addClasspathEntry)
 
-    val localSecondaryJarLinks = conf.getStrings(CONF_SPARK_YARN_SECONDARY_JARS)
+    val localSecondaryJarLinks = 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)

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ trait ClientBase extends Logging {`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`}`
`244`		`- conf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))`
	`244`	`+ sparkConf.set(ClientBase.CONF_SPARK_YARN_SECONDARY_JARS, cachedJarLinks.mkString(","))`
`245`	`245`
`246`	`246`	`UserGroupInformation.getCurrentUser().addCredentials(credentials)`
`247`	`247`	`localResources`
`@@ -485,7 +485,7 @@ object ClientBase {`
`485`	`485`
`486`	`486`	`extraClassPath.foreach(addClasspathEntry)`
`487`	`487`
`488`		`- val localSecondaryJarLinks = conf.getStrings(CONF_SPARK_YARN_SECONDARY_JARS)`
	`488`	`+ val localSecondaryJarLinks = sparkConf.getOption(CONF_SPARK_YARN_SECONDARY_JARS).getOrElse("").split(",")`
`489`	`489`	`// Normally the users app.jar is last in case conflicts with spark jars`
`490`	`490`	`if (sparkConf.get("spark.yarn.user.classpath.first", "false").toBoolean) {`
`491`	`491`	`addPwdClasspathEntry(APP_JAR)`