Skip to content

Commit ee01986

Browse files
mccheahfoxish
authored andcommitted
Remove unused driver extra classpath upload code (alteryx#54)
1 parent 25abc4d commit ee01986

File tree

4 files changed

+1
-18
lines changed

4 files changed

+1
-18
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@ object SparkSubmit extends CommandLineUtils {
485485
sysProp = "spark.kubernetes.namespace"),
486486
OptionAssigner(args.kubernetesUploadJars, KUBERNETES, CLUSTER,
487487
sysProp = "spark.kubernetes.driver.uploads.jars"),
488-
OptionAssigner(args.kubernetesUploadDriverExtraClasspath, KUBERNETES, CLUSTER,
489-
sysProp = "spark.kubernetes.driver.uploads.driverExtraClasspath"),
490488

491489
// Other options
492490
OptionAssigner(args.executorCores, STANDALONE | YARN, ALL_DEPLOY_MODES,

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
7474
// Kubernetes only
7575
var kubernetesNamespace: String = null
7676
var kubernetesUploadJars: String = null
77-
var kubernetesUploadDriverExtraClasspath: String = null
7877

7978
// Standalone cluster mode only
8079
var supervise: Boolean = false
@@ -204,9 +203,6 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
204203
kubernetesUploadJars = Option(kubernetesUploadJars)
205204
.orElse(sparkProperties.get("spark.kubernetes.driver.uploads.jars"))
206205
.orNull
207-
kubernetesUploadDriverExtraClasspath = Option(kubernetesUploadDriverExtraClasspath)
208-
.orElse(sparkProperties.get("spark.kubernetes.driver.uploads.driverExtraClasspath"))
209-
.orNull
210206

211207
// Try to set main class from JAR if no --class argument is given
212208
if (mainClass == null && !isPython && !isR && primaryResource != null) {
@@ -451,9 +447,6 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
451447
case KUBERNETES_UPLOAD_JARS =>
452448
kubernetesUploadJars = value
453449

454-
case KUBERNETES_UPLOAD_DRIVER_EXTRA_CLASSPATH =>
455-
kubernetesUploadDriverExtraClasspath = value
456-
457450
case HELP =>
458451
printUsageAndExit(0)
459452

launcher/src/main/java/org/apache/spark/launcher/SparkSubmitOptionParser.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ class SparkSubmitOptionParser {
8080
protected final String KUBERNETES_MASTER = "--kubernetes-master";
8181
protected final String KUBERNETES_NAMESPACE = "--kubernetes-namespace";
8282
protected final String KUBERNETES_UPLOAD_JARS = "--upload-jars";
83-
protected final String KUBERNETES_UPLOAD_DRIVER_EXTRA_CLASSPATH =
84-
"--upload-driver-extra-classpath";
8583

8684
/**
8785
* This is the canonical list of spark-submit options. Each entry in the array contains the
@@ -124,8 +122,7 @@ class SparkSubmitOptionParser {
124122
{ TOTAL_EXECUTOR_CORES },
125123
{ KUBERNETES_MASTER },
126124
{ KUBERNETES_NAMESPACE },
127-
{ KUBERNETES_UPLOAD_JARS },
128-
{ KUBERNETES_UPLOAD_DRIVER_EXTRA_CLASSPATH }
125+
{ KUBERNETES_UPLOAD_JARS }
129126
};
130127

131128
/**

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/rest/kubernetes/KubernetesSparkRestServer.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ private[spark] class KubernetesSparkRestServer(
135135
} else {
136136
val tempDir = Utils.createTempDir()
137137
val appResourcePath = resolvedAppResource(appResource, tempDir)
138-
val driverClasspathDirectory = new File(tempDir, "driver-extra-classpath")
139-
if (!driverClasspathDirectory.mkdir) {
140-
throw new IllegalStateException("Failed to create driver extra classpath" +
141-
s" dir at ${driverClasspathDirectory.getAbsolutePath}")
142-
}
143138
val jarsDirectory = new File(tempDir, "jars")
144139
if (!jarsDirectory.mkdir) {
145140
throw new IllegalStateException("Failed to create jars dir at" +

0 commit comments

Comments
 (0)