Skip to content

Commit 3bb75e8

Browse files
committed
Allow SparkSubmit --jars to take effect in yarn-client mode
1 parent 191279c commit 3bb75e8

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ object SparkSubmit {
188188
OptionAssigner(args.jars, YARN, true, clOption = "--addJars"),
189189
OptionAssigner(args.files, LOCAL | STANDALONE | MESOS, false, sysProp = "spark.files"),
190190
OptionAssigner(args.files, LOCAL | STANDALONE | MESOS, true, sysProp = "spark.files"),
191-
OptionAssigner(args.jars, LOCAL | STANDALONE | MESOS, false, sysProp = "spark.jars"),
191+
OptionAssigner(args.jars, ALL_CLUSTER_MGRS, false, sysProp = "spark.jars"),
192192
OptionAssigner(args.name, LOCAL | STANDALONE | MESOS, false, sysProp = "spark.app.name")
193193
)
194194

@@ -211,15 +211,12 @@ object SparkSubmit {
211211
}
212212
}
213213

214-
// For standalone mode, add the application jar automatically so the user doesn't have to
215-
// call sc.addJar. TODO: Standalone mode in the cluster
216-
if (clusterManager == STANDALONE) {
217-
var jars = sysProps.get("spark.jars").map(x => x.split(",").toSeq).getOrElse(Seq())
218-
if (args.primaryResource != RESERVED_JAR_NAME) {
219-
jars = jars ++ Seq(args.primaryResource)
220-
}
221-
sysProps.put("spark.jars", jars.mkString(","))
214+
// Add the application jar automatically so the user doesn't have to call sc.addJar
215+
var jars = sysProps.get("spark.jars").map(x => x.split(",").toSeq).getOrElse(Seq())
216+
if (args.primaryResource != RESERVED_JAR_NAME) {
217+
jars = jars ++ Seq(args.primaryResource)
222218
}
219+
sysProps.put("spark.jars", jars.mkString(","))
223220

224221
if (deployOnCluster && clusterManager == STANDALONE) {
225222
if (args.supervise) {

0 commit comments

Comments
 (0)