Skip to content

[SPARK-32713][K8S] Support execId placeholder in executor PVC conf #29557

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 1 commit into from
Closed

[SPARK-32713][K8S] Support execId placeholder in executor PVC conf #29557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion ...es/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.deploy.k8s.features
import io.fabric8.kubernetes.api.model._

import org.apache.spark.deploy.k8s._
import org.apache.spark.deploy.k8s.Constants.ENV_EXECUTOR_ID

private[spark] class MountVolumesFeatureStep(conf: KubernetesConf)
extends KubernetesFeatureConfigStep {
Expand Down Expand Up @@ -56,7 +57,13 @@ private[spark] class MountVolumesFeatureStep(conf: KubernetesConf)
new VolumeBuilder()
.withHostPath(new HostPathVolumeSource(hostPath, ""))

case KubernetesPVCVolumeConf(claimName) =>
case KubernetesPVCVolumeConf(claimNameTemplate) =>
val claimName = conf match {
case c: KubernetesExecutorConf =>
claimNameTemplate.replaceAll(ENV_EXECUTOR_ID, c.executorId)
case _ =>
claimNameTemplate
}
new VolumeBuilder()
.withPersistentVolumeClaim(
new PersistentVolumeClaimVolumeSource(claimName, spec.mountReadOnly))
Expand Down
25 changes: 25 additions & 0 deletions ...re/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,31 @@ class MountVolumesFeatureStepSuite extends SparkFunSuite {

}

test("SPARK-32713 Mounts parameterized persistentVolumeClaims in executors") {
val volumeConf = KubernetesVolumeSpec(
"testVolume",
"/tmp",
"",
true,
KubernetesPVCVolumeConf("pvc-spark-SPARK_EXECUTOR_ID")
)
val driverConf = KubernetesTestConf.createDriverConf(volumes = Seq(volumeConf))
val driverStep = new MountVolumesFeatureStep(driverConf)
val driverPod = driverStep.configurePod(SparkPod.initialPod())

assert(driverPod.pod.getSpec.getVolumes.size() === 1)
val driverPVC = driverPod.pod.getSpec.getVolumes.get(0).getPersistentVolumeClaim
assert(driverPVC.getClaimName === "pvc-spark-SPARK_EXECUTOR_ID")

val executorConf = KubernetesTestConf.createExecutorConf(volumes = Seq(volumeConf))
val executorStep = new MountVolumesFeatureStep(executorConf)
val executorPod = executorStep.configurePod(SparkPod.initialPod())

assert(executorPod.pod.getSpec.getVolumes.size() === 1)
val executorPVC = executorPod.pod.getSpec.getVolumes.get(0).getPersistentVolumeClaim
assert(executorPVC.getClaimName === s"pvc-spark-${KubernetesTestConf.EXECUTOR_ID}")
}

test("Mounts emptyDir") {
val volumeConf = KubernetesVolumeSpec(
"testVolume",
Expand Down