You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/04/28 01:52:46 UTC
spark git commit: [SPARK-7162] [YARN] Launcher error in yarn-client
Repository: spark
Updated Branches:
refs/heads/master ab5adb7a9 -> 62888a4de
[SPARK-7162] [YARN] Launcher error in yarn-client
jira: https://issues.apache.org/jira/browse/SPARK-7162
Author: GuoQiang Li <wi...@qq.com>
Closes #5716 from witgo/SPARK-7162 and squashes the following commits:
b64564c [GuoQiang Li] Launcher error in yarn-client
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/62888a4d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/62888a4d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/62888a4d
Branch: refs/heads/master
Commit: 62888a4ded91b3c2cbb05936c374c7ebfc10799e
Parents: ab5adb7
Author: GuoQiang Li <wi...@qq.com>
Authored: Mon Apr 27 19:52:41 2015 -0400
Committer: Sean Owen <so...@cloudera.com>
Committed: Mon Apr 27 19:52:41 2015 -0400
----------------------------------------------------------------------
yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/62888a4d/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------
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 019afbd..741239c 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
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org