Skip to content

[SPARK-20708][CORE] Make addExclusionRules up-to-date #17947

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

[SPARK-20708][CORE] Make addExclusionRules up-to-date #17947

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ac403a
[SPARK-20708][CORE] Make `addExclusionRules` up-to-date
dongjoon-hyun May 11, 2017
bfa5238
Address comments.
dongjoon-hyun May 30, 2017
d562ea2
Make as a static variable of SparkSubmitUtils object.
dongjoon-hyun May 30, 2017
8b184e7
Rename the variable and add documents.
dongjoon-hyun Jun 1, 2017
2cf5400
fix scalastyle.
dongjoon-hyun 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
5 changes: 3 additions & 2 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 @@ -964,8 +964,9 @@ private[spark] object SparkSubmitUtils {
// We need to specify each component explicitly, otherwise we miss spark-streaming-kafka-0-8 and
// other spark-streaming utility components. Underscore is there to differentiate between
// spark-streaming_2.1x and spark-streaming-kafka-0-8-assembly_2.1x
val components = Seq("catalyst_", "core_", "graphx_", "hive_", "mllib_", "repl_",
"sql_", "streaming_", "yarn_", "network-common_", "network-shuffle_", "network-yarn_")
val components = Seq("catalyst_", "core_", "graphx_", "hive_", "hive-thriftserver_",
"launcher_", "mesos_", "mllib_", "mllib-local_", "network-common_", "network-shuffle_",
"network-yarn_", "repl_", "sketch_", "sql_", "streaming_", "tags_", "unsafe_", "yarn_")

components.foreach { comp =>
md.addExcludeRule(createExclusion(s"org.apache.spark:spark-$comp*:*", ivySettings,
Expand Down
7 changes: 4 additions & 3 deletions core/src/test/scala/org/apache/spark/deploy/SparkSubmitUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,12 @@ class SparkSubmitUtilsSuite extends SparkFunSuite with BeforeAndAfterAll {
}

test("neglects Spark and Spark's dependencies") {
val components = Seq("catalyst_", "core_", "graphx_", "hive_", "mllib_", "repl_",
"sql_", "streaming_", "yarn_", "network-common_", "network-shuffle_", "network-yarn_")
val components = Seq("catalyst_", "core_", "graphx_", "hive_", "hive-thriftserver_",

@brkyvz brkyvz May 30, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

since the hive, mesos stuff is not in the assembly jar by default, I don't think we need to exclude those

@brkyvz brkyvz May 30, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

same for yarn

@dongjoon-hyun dongjoon-hyun May 30, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I see. I'll remove hive, hive-thriftserver, mesos, and yarn.

@dongjoon-hyun dongjoon-hyun May 30, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Maybe, network-yarn_, too.

"launcher_", "mesos_", "mllib_", "mllib-local_", "network-common_", "network-shuffle_",
"network-yarn_", "repl_", "sketch_", "sql_", "streaming_", "tags_", "unsafe_", "yarn_")

val coordinates =
components.map(comp => s"org.apache.spark:spark-${comp}2.10:1.2.0").mkString(",") +
components.map(comp => s"org.apache.spark:spark-${comp}2.10:2.1.1").mkString(",") +

@brkyvz brkyvz May 30, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

maybe also change Scala version too, since we will remove 2.10 soon

@dongjoon-hyun dongjoon-hyun May 30, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Sure! Thank you for review.

",org.apache.spark:spark-core_fake:1.2.0"

val path = SparkSubmitUtils.resolveMavenCoordinates(
Expand Down