Skip to content

Commit 85fe129

Browse files
Stavros KontopoulosAnirudh Ramanathan
Stavros Kontopoulos
authored and
Anirudh Ramanathan
committed
[SPARK-24428][K8S] Fix unused code
## What changes were proposed in this pull request? Remove code that is misleading and is a leftover from a previous implementation. ## How was this patch tested? Manually. Author: Stavros Kontopoulos <stavros.kontopoulos@lightbend.com> Closes #21462 from skonto/fix-k8s-docs.
1 parent 4281554 commit 85fe129

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Constants.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ private[spark] object Constants {
2525
val SPARK_POD_DRIVER_ROLE = "driver"
2626
val SPARK_POD_EXECUTOR_ROLE = "executor"
2727

28-
// Annotations
29-
val SPARK_APP_NAME_ANNOTATION = "spark-app-name"
30-
3128
// Credentials secrets
3229
val DRIVER_CREDENTIALS_SECRETS_BASE_DIR =
3330
"/mnt/secrets/spark-kubernetes-credentials"
@@ -50,17 +47,14 @@ private[spark] object Constants {
5047
val DEFAULT_BLOCKMANAGER_PORT = 7079
5148
val DRIVER_PORT_NAME = "driver-rpc-port"
5249
val BLOCK_MANAGER_PORT_NAME = "blockmanager"
53-
val EXECUTOR_PORT_NAME = "executor"
5450

5551
// Environment Variables
56-
val ENV_EXECUTOR_PORT = "SPARK_EXECUTOR_PORT"
5752
val ENV_DRIVER_URL = "SPARK_DRIVER_URL"
5853
val ENV_EXECUTOR_CORES = "SPARK_EXECUTOR_CORES"
5954
val ENV_EXECUTOR_MEMORY = "SPARK_EXECUTOR_MEMORY"
6055
val ENV_APPLICATION_ID = "SPARK_APPLICATION_ID"
6156
val ENV_EXECUTOR_ID = "SPARK_EXECUTOR_ID"
6257
val ENV_EXECUTOR_POD_IP = "SPARK_EXECUTOR_POD_IP"
63-
val ENV_MOUNTED_CLASSPATH = "SPARK_MOUNTED_CLASSPATH"
6458
val ENV_JAVA_OPT_PREFIX = "SPARK_JAVA_OPT_"
6559
val ENV_CLASSPATH = "SPARK_CLASSPATH"
6660
val ENV_DRIVER_BIND_ADDRESS = "SPARK_DRIVER_BIND_ADDRESS"

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/KubernetesClusterManager.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ private[spark] class KubernetesClusterManager extends ExternalClusterManager wit
4848
sc: SparkContext,
4949
masterURL: String,
5050
scheduler: TaskScheduler): SchedulerBackend = {
51-
val executorSecretNamesToMountPaths = KubernetesUtils.parsePrefixedKeyValuePairs(
52-
sc.conf, KUBERNETES_EXECUTOR_SECRETS_PREFIX)
5351
val kubernetesClient = SparkKubernetesClientFactory.createKubernetesClient(
5452
KUBERNETES_MASTER_INTERNAL_URL,
5553
Some(sc.conf.get(KUBERNETES_NAMESPACE)),

resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ esac
5151

5252
SPARK_CLASSPATH="$SPARK_CLASSPATH:${SPARK_HOME}/jars/*"
5353
env | grep SPARK_JAVA_OPT_ | sort -t_ -k4 -n | sed 's/[^=]*=\(.*\)/\1/g' > /tmp/java_opts.txt
54-
readarray -t SPARK_JAVA_OPTS < /tmp/java_opts.txt
55-
if [ -n "$SPARK_MOUNTED_CLASSPATH" ]; then
56-
SPARK_CLASSPATH="$SPARK_CLASSPATH:$SPARK_MOUNTED_CLASSPATH"
57-
fi
58-
if [ -n "$SPARK_MOUNTED_FILES_DIR" ]; then
59-
cp -R "$SPARK_MOUNTED_FILES_DIR/." .
54+
readarray -t SPARK_EXECUTOR_JAVA_OPTS < /tmp/java_opts.txt
55+
56+
if [ -n "$SPARK_EXTRA_CLASSPATH" ]; then
57+
SPARK_CLASSPATH="$SPARK_CLASSPATH:$SPARK_EXTRA_CLASSPATH"
6058
fi
6159

6260
if [ -n "$PYSPARK_FILES" ]; then
@@ -101,7 +99,7 @@ case "$SPARK_K8S_CMD" in
10199
executor)
102100
CMD=(
103101
${JAVA_HOME}/bin/java
104-
"${SPARK_JAVA_OPTS[@]}"
102+
"${SPARK_EXECUTOR_JAVA_OPTS[@]}"
105103
-Xms$SPARK_EXECUTOR_MEMORY
106104
-Xmx$SPARK_EXECUTOR_MEMORY
107105
-cp "$SPARK_CLASSPATH"

0 commit comments

Comments
 (0)