Skip to content

[SPARK-12666][CORE] SparkSubmit packages fix for when 'default' conf doesn't exist in dependent module #13428

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
BryanCutler wants to merge 4 commits into from
Closed

[SPARK-12666][CORE] SparkSubmit packages fix for when 'default' conf doesn't exist in dependent module #13428

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d0c21
Added fallback wildcard for the case where 'default' conf doesn't exist
BryanCutler Jun 1, 2016
ece86f1
needed to define an artifact pattern along with ivy pattern to resolv…
BryanCutler Jun 1, 2016
b87e0c9
changed local-ivy-cache resolver to fallback to runtime conf if defau…
BryanCutler Jun 1, 2016
df1ac92
added back in setting of FileResolver root as backup, combined path j…
BryanCutler Aug 16, 2016
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
11 changes: 7 additions & 4 deletions core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,9 +892,12 @@ private[spark] object SparkSubmitUtils {
val localIvyRoot = new File(ivySettings.getDefaultIvyUserDir, "local")
localIvy.setLocal(true)
localIvy.setRepository(new FileRepository(localIvyRoot))
Copy link
Contributor

@brkyvz brkyvz Jun 29, 2016

Choose a reason for hiding this comment

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

don't we need to keep this for the local IvyCache?

Copy link
Member Author

@BryanCutler BryanCutler Jun 29, 2016

Choose a reason for hiding this comment

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

It's redundant because the filesystem patterns defined below use an absolute path (with the localIvyRoot) and the resolver then ignores the repository root set here. Only if it determines the patterns are using relative paths it will then prefix them with the root. It doesn't hurt anything to leave it in though, if you prefer.

Copy link
Contributor

@JoshRosen JoshRosen Aug 13, 2016

Choose a reason for hiding this comment

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

Everything else being equal, I'm in favor of leaving this. Maybe it's redundant but it might prevent bugs in case someone else comes along and tries to remove the use of absolute paths below (or forgets to use an absolute path in new code).

val ivyPattern = Seq("[organisation]", "[module]", "[revision]", "[type]s",
"[artifact](-[classifier]).[ext]").mkString(File.separator)
localIvy.addIvyPattern(localIvyRoot.getAbsolutePath + File.separator + ivyPattern)
val ivyPattern = Seq(localIvyRoot.getAbsolutePath, "[organisation]", "[module]", "[revision]",
"ivys", "ivy.xml").mkString(File.separator)
localIvy.addIvyPattern(ivyPattern)
val artifactPattern = Seq(localIvyRoot.getAbsolutePath, "[organisation]", "[module]",
"[revision]", "[type]s", "[artifact](-[classifier]).[ext]").mkString(File.separator)
localIvy.addArtifactPattern(artifactPattern)
localIvy.setName("local-ivy-cache")
cr.add(localIvy)

Expand Down Expand Up @@ -939,7 +942,7 @@ private[spark] object SparkSubmitUtils {
artifacts.foreach { mvn =>
val ri = ModuleRevisionId.newInstance(mvn.groupId, mvn.artifactId, mvn.version)
val dd = new DefaultDependencyDescriptor(ri, false, false)
dd.addDependencyConfiguration(ivyConfName, ivyConfName)
dd.addDependencyConfiguration(ivyConfName, ivyConfName + "(runtime)")
// scalastyle:off println
printStream.println(s"${dd.getDependencyId} added as a dependency")
// scalastyle:on println
Expand Down