Skip to content

[SPARK-5479] [yarn] Handle --py-files correctly in YARN. #6360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vanzin wants to merge 13 commits into from
Closed

[SPARK-5479] [yarn] Handle --py-files correctly in YARN. #6360

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
943cbf4
[SPARK-5479] [yarn] Handle --py-files correctly in YARN.
May 21, 2015
09045f1
Style.
May 22, 2015
7fe3cd4
No need to distribute primary file to executors.
May 25, 2015
cdbb990
Merge branch 'master' into SPARK-5479
Jun 1, 2015
220358b
Scalastyle.
Jun 2, 2015
71ee736
Merge branch 'master' into SPARK-5479
Jun 4, 2015
1dd4d0c
Review feedback.
Jun 5, 2015
705571d
Move some code to the YARN module.
Jun 5, 2015
c8e5a82
Actually run pyspark in client mode.
Jun 5, 2015
c743778
Only pyspark cares about python archives.
Jun 5, 2015
46b1d0c
Merge branch 'master' into SPARK-5479
Jun 5, 2015
c47501f
Fix yarn-client mode.
Jun 5, 2015
bcaf7e6
Feedback.
Jun 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Scalastyle.
  • Loading branch information
Marcelo Vanzin committed Jun 2, 2015
commit 220358bc53ff2cc97c8f31d00a7166563f82046d
2 changes: 1 addition & 1 deletion yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ private[spark] class Client(
("log4j.properties", oldLog4jConf.orNull, null)
).foreach { case (destName, path, confKey) =>
if (path != null && !path.isEmpty()) {
Copy link
Contributor

@andrewor14 andrewor14 Jun 4, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is very slightly different from before; before we trimmed the path before checking whether it's empty. Maybe it's not necessary but just to make sure we're aware of this

val (isLocal, localizedPath) = distribute(path, destName=Some(destName))
val (isLocal, localizedPath) = distribute(path, destName = Some(destName))
if (isLocal && confKey != null) {
// If the resource is intended for local use only, handle this downstream
// by setting the appropriate property
Expand Down