Skip to content

[SPARK-42769][K8S] Add SPARK_DRIVER_POD_IP env variable to executor pods #40392

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 2 commits into from
Closed

[SPARK-42769][K8S] Add SPARK_DRIVER_POD_IP env variable to executor pods #40392

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27174e5
[SPARK-42769][K8S] Add ENV_DRIVER_POD_IP env variable to executor pods
dongjoon-hyun Mar 13, 2023
c153ba2
Revise test case name
dongjoon-hyun Mar 13, 2023
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
Next Next commit
[SPARK-42769][K8S] Add ENV_DRIVER_POD_IP env variable to executor pods
  • Loading branch information
@dongjoon-hyun
dongjoon-hyun committed Mar 13, 2023
commit 27174e59fe85cb3add536cb153d64cb75ea96e42
1 change: 1 addition & 0 deletions resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ private[spark] object Constants {
val UI_PORT_NAME = "spark-ui"

// Environment Variables
val ENV_DRIVER_POD_IP = "SPARK_DRIVER_POD_IP"
Copy link
Member

@viirya viirya Mar 13, 2023

Choose a reason for hiding this comment

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

Is it different to DRIVER_HOST_ADDRESS? I saw K8s uses DRIVER_HOST_ADDRESS to derive driver url for env var ENV_DRIVER_URL.

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Mar 13, 2023

Choose a reason for hiding this comment

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

Thank you for review, @viirya .

In K8s, DRIVER_HOST_ADDRESS is protected by DriverServiceFeatureStep here.

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

Line 109 in 7fccd67

val DRIVER_HOST_KEY = config.DRIVER_HOST_ADDRESS.key

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

Lines 38 to 40 in 7fccd67

require(kubernetesConf.getOption(DRIVER_HOST_KEY).isEmpty,
s"$DRIVER_HOST_KEY is not supported in Kubernetes mode, as the driver's hostname will be " +
"managed via a Kubernetes service.")

It's because we inject like this systematically.

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

Lines 67 to 68 in 7fccd67

val driverHostname = s"$resolvedServiceName.${kubernetesConf.namespace}.svc"
Map(DRIVER_HOST_KEY -> driverHostname,

However, when DNS doesn't work, we need IP which is unknown from the executor pods so far.

val ENV_DRIVER_URL = "SPARK_DRIVER_URL"
val ENV_EXECUTOR_CORES = "SPARK_EXECUTOR_CORES"
val ENV_EXECUTOR_MEMORY = "SPARK_EXECUTOR_MEMORY"
Expand Down
1 change: 1 addition & 0 deletions resource-managers/kubernetes/docker/src/main/dockerfiles/spark/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ case "$1" in
CMD=(
"$SPARK_HOME/bin/spark-submit"
--conf "spark.driver.bindAddress=$SPARK_DRIVER_BIND_ADDRESS"
--conf "spark.executorEnv.SPARK_DRIVER_POD_IP=$SPARK_DRIVER_BIND_ADDRESS"
--deploy-mode client
"$@"
)
Expand Down
9 changes: 9 additions & 0 deletions ...on-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/BasicTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,15 @@ private[spark] trait BasicTestsSuite { k8sSuite: KubernetesSuite =>
runSparkRemoteCheckAndVerifyCompletion(appArgs = Array(REMOTE_PAGE_RANK_FILE_NAME))
}
}

test("SPARK-42769: All executor pods have ENV_DRIVER_POD_IP env variable", k8sTestTag) {
runSparkPiAndVerifyCompletion(
executorPodChecker = (executorPod: Pod) => {
doBasicExecutorPodCheck(executorPod)
executorPod.getSpec.getContainers.get(0).getEnv.asScala
.exists(envVar => envVar.getName == "SPARK_DRIVER_POD_IP")
})
}
}

private[spark] object BasicTestsSuite extends SparkFunSuite {
Expand Down