Skip to content

[SPARK-20365][YARN] Remove LocalSchem when add path to ClassPath. #18129

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
lycplus wants to merge 5 commits into from
Closed

[SPARK-20365][YARN] Remove LocalSchem when add path to ClassPath. #18129

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
811f28b
Remove LocalSchem when add path to ClassPath.
lycplus May 27, 2017
4ed085b
Add test for checking local is not in ClassPath.
lycplus May 27, 2017
79105f8
Revert style changes.
lycplus May 31, 2017
683f0d9
Avoid noisy changes and keep the existing style.
lycplus Jun 1, 2017
35e5859
Fix style.
lycplus Jun 1, 2017
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
3 changes: 2 additions & 1 deletion resource-managers/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 @@ -1275,7 +1275,8 @@ private object Client extends Logging {
if (sparkConf.get(SPARK_ARCHIVE).isEmpty) {
sparkConf.get(SPARK_JARS).foreach { jars =>
jars.filter(isLocalUri).foreach { jar =>
addClasspathEntry(getClusterPath(sparkConf, jar), env)
val uri = new URI(jar)
addClasspathEntry(getClusterPath(sparkConf, uri.getPath), env)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ClientSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,16 @@ class ClientSuite extends SparkFunSuite with Matchers with BeforeAndAfterAll
val cp = env("CLASSPATH").split(":|;|<CPS>")
s"$SPARK,$USER,$ADDED".split(",").foreach({ entry =>
val uri = new URI(entry)
if (LOCAL_SCHEME.equals(uri.getScheme())) {
cp should contain (uri.getPath())
if (LOCAL_SCHEME.equals(uri.getScheme)) {
cp should contain (uri.getPath)
Copy link
Contributor

@jerryshao jerryshao May 31, 2017

Choose a reason for hiding this comment

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

Maybe it is not so necessary to change the previous style.

Copy link
Contributor Author

@lycplus lycplus May 31, 2017

Choose a reason for hiding this comment

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

It is Intellij that advises the above changes. I will revert them.

} else {
cp should not contain (uri.getPath())
cp should not contain uri.getPath
}
})
cp should not contain "local"
Copy link
Contributor

@jerryshao jerryshao Jun 1, 2017

Choose a reason for hiding this comment

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

Can you please add parentheses here ("local").

cp should contain(PWD)
cp should contain (s"$PWD${Path.SEPARATOR}${LOCALIZED_CONF_DIR}")
cp should not contain (APP_JAR)
cp should contain (s"$PWD${Path.SEPARATOR}$LOCALIZED_CONF_DIR")
cp should not contain APP_JAR
}

test("Jar path propagation through SparkConf") {
Expand Down