[SPARK-7162] [YARN] Launcher error in yarn-client

witgo · srowen · commit 62888a4ded91 · 2015-04-27T19:52:41.000-04:00
jira: https://issues.apache.org/jira/browse/SPARK-7162 Author: GuoQiang Li <witgo@qq.com> Closes apache#5716 from witgo/SPARK-7162 and squashes the following commits: b64564c [GuoQiang Li] Launcher error in yarn-client
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -354,7 +354,7 @@ private[spark] class Client(
         val dir = new File(path)
         if (dir.isDirectory()) {
           dir.listFiles().foreach { file =>
-            if (!hadoopConfFiles.contains(file.getName())) {
+            if (file.isFile && !hadoopConfFiles.contains(file.getName())) {
               hadoopConfFiles(file.getName()) = file
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ private[spark] class Client(`
`354`	`354`	`val dir = new File(path)`
`355`	`355`	`if (dir.isDirectory()) {`
`356`	`356`	`dir.listFiles().foreach { file =>`
`357`		`- if (!hadoopConfFiles.contains(file.getName())) {`
	`357`	`+ if (file.isFile && !hadoopConfFiles.contains(file.getName())) {`
`358`	`358`	`hadoopConfFiles(file.getName()) = file`
`359`	`359`	`}`
`360`	`360`	`}`