diff options
| author | GuoQiang Li <witgo@qq.com> | 2015-04-27 19:52:41 -0400 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-04-27 19:52:41 -0400 |
| commit | 62888a4ded91b3c2cbb05936c374c7ebfc10799e (patch) | |
| tree | 3e91b16f442031335bc88ca23ee350e74e427646 /yarn | |
| parent | ab5adb7a973eec9d95c7575c864cba9f8d83a0fd (diff) | |
| download | spark-62888a4ded91b3c2cbb05936c374c7ebfc10799e.tar.gz spark-62888a4ded91b3c2cbb05936c374c7ebfc10799e.tar.bz2 spark-62888a4ded91b3c2cbb05936c374c7ebfc10799e.zip | |
[SPARK-7162] [YARN] Launcher error in yarn-client
jira: https://issues.apache.org/jira/browse/SPARK-7162
Author: GuoQiang Li <witgo@qq.com>
Closes #5716 from witgo/SPARK-7162 and squashes the following commits:
b64564c [GuoQiang Li] Launcher error in yarn-client
Diffstat (limited to 'yarn')
| -rw-r--r-- | yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 index 019afbd1a1..741239c953 100644 --- 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 } } |