You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2022/03/10 05:40:21 UTC
[spark] branch branch-3.2 updated: Revert "[SPARK-38379][K8S] Fix Kubernetes Client mode when mounting persistent volume with storage class"
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new c52c34a Revert "[SPARK-38379][K8S] Fix Kubernetes Client mode when mounting persistent volume with storage class"
c52c34a is described below
commit c52c34a8429bf7fe58c1d5d33117974b602905a3
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Mar 9 21:39:26 2022 -0800
Revert "[SPARK-38379][K8S] Fix Kubernetes Client mode when mounting persistent volume with storage class"
This reverts commit f97c3b37b85fecd78627e7f85da1f2edbcc75910.
---
.../k8s/features/MountVolumesFeatureStep.scala | 2 +-
.../features/MountVolumesFeatureStepSuite.scala | 25 ----------------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala
index 78dd6ec..4e16473 100644
--- a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala
+++ b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStep.scala
@@ -85,7 +85,7 @@ private[spark] class MountVolumesFeatureStep(conf: KubernetesConf)
.withApiVersion("v1")
.withNewMetadata()
.withName(claimName)
- .addToLabels(SPARK_APP_ID_LABEL, conf.appId)
+ .addToLabels(SPARK_APP_ID_LABEL, conf.sparkConf.getAppId)
.endMetadata()
.withNewSpec()
.withStorageClassName(storageClass.get)
diff --git a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala
index 468d1dd..38f8fac 100644
--- a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala
+++ b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala
@@ -89,31 +89,6 @@ class MountVolumesFeatureStepSuite extends SparkFunSuite {
assert(executorPVC.getClaimName === s"pvc-spark-${KubernetesTestConf.EXECUTOR_ID}")
}
- test("SPARK-32713 Mounts parameterized persistentVolumeClaims in executors with storage class") {
- val volumeConf = KubernetesVolumeSpec(
- "testVolume",
- "/tmp",
- "",
- true,
- KubernetesPVCVolumeConf("pvc-spark-SPARK_EXECUTOR_ID", Some("fast"), Some("512mb"))
- )
- 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("Create and mounts persistentVolumeClaims in driver") {
val volumeConf = KubernetesVolumeSpec(
"testVolume",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org