refactoring

apache · Apr 27, 2020 · 6d54251 · 6d54251
1 parent e0f7765
commit 6d54251
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -1271,11 +1271,9 @@ private object Client extends Logging {
    */
   private[yarn] def populateHadoopClasspath(conf: Configuration, env: HashMap[String, String])
     : Unit = {
-    if (sparkConf.get(POPULATE_HADOOP_CLASSPATH)) {
-      val classPathElementsToAdd = getYarnAppClasspath(conf) ++ getMRAppClasspath(conf)
-      classPathElementsToAdd.foreach { c =>
-        YarnSparkHadoopUtil.addPathToEnvironment(env, Environment.CLASSPATH.name, c.trim)
-      }
+    val classPathElementsToAdd = getYarnAppClasspath(conf) ++ getMRAppClasspath(conf)
+    classPathElementsToAdd.foreach { c =>
+      YarnSparkHadoopUtil.addPathToEnvironment(env, Environment.CLASSPATH.name, c.trim)
     }
   }
 
@@ -1355,7 +1353,10 @@ private object Client extends Logging {
       }
     }
 
-    populateHadoopClasspath(conf, env)
+    if (sparkConf.get(POPULATE_HADOOP_CLASSPATH)) {
+      populateHadoopClasspath(conf, env)
+    }
+
     sys.env.get(ENV_DIST_CLASSPATH).foreach { cp =>
       addClasspathEntry(getClusterPath(sparkConf, cp), env)
     }