[SPARK-24902][K8s] Add PV integration tests #23514
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.deploy.k8s.integrationtest | ||
|
|
||
| import java.io.{File, PrintWriter} | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import io.fabric8.kubernetes.api.model._ | ||
| import io.fabric8.kubernetes.api.model.storage.StorageClassBuilder | ||
| import org.scalatest.Tag | ||
| import org.scalatest.concurrent.{Eventually, PatienceConfiguration} | ||
| import org.scalatest.time.{Milliseconds, Span} | ||
|
|
||
| import org.apache.spark.deploy.k8s.integrationtest.KubernetesSuite._ | ||
|
|
||
| private[spark] trait PVTestsSuite { k8sSuite: KubernetesSuite => | ||
| import PVTestsSuite._ | ||
|
|
||
| private def setupLocalStorage(): Unit = { | ||
| val scBuilder = new StorageClassBuilder() | ||
| .withKind("StorageClass") | ||
| .withApiVersion("storage.k8s.io/v1") | ||
| .withNewMetadata() | ||
| .withName(STORAGE_NAME) | ||
| .endMetadata() | ||
| .withProvisioner("kubernetes.io/no-provisioner") | ||
| .withVolumeBindingMode("WaitForFirstConsumer") | ||
|
|
||
| val pvBuilder = new PersistentVolumeBuilder() | ||
| .withKind("PersistentVolume") | ||
| .withApiVersion("v1") | ||
| .withNewMetadata() | ||
| .withName("test-local-pv") | ||
| .endMetadata() | ||
| .withNewSpec() | ||
| .withCapacity(Map("storage" -> new QuantityBuilder().withAmount("1Gi").build()).asJava) | ||
| .withAccessModes("ReadWriteOnce") | ||
| .withPersistentVolumeReclaimPolicy("Retain") | ||
| .withStorageClassName("test-local-storage") | ||
| .withLocal(new LocalVolumeSourceBuilder().withPath(VM_PATH).build()) | ||
| .withNewNodeAffinity() | ||
| .withNewRequired() | ||
| .withNodeSelectorTerms(new NodeSelectorTermBuilder() | ||
| .withMatchExpressions(new NodeSelectorRequirementBuilder() | ||
| .withKey("kubernetes.io/hostname") | ||
| .withOperator("In") | ||
| .withValues("minikube").build()).build()) | ||
| .endRequired() | ||
| .endNodeAffinity() | ||
| .endSpec() | ||
|
|
||
| val pvcBuilder = new PersistentVolumeClaimBuilder() | ||
| .withKind("PersistentVolumeClaim") | ||
| .withApiVersion("v1") | ||
| .withNewMetadata() | ||
| .withName(PVC_NAME) | ||
| .endMetadata() | ||
| .withNewSpec() | ||
| .withAccessModes("ReadWriteOnce") | ||
| .withStorageClassName("test-local-storage") | ||
| .withResources(new ResourceRequirementsBuilder() | ||
| .withRequests(Map("storage" -> new QuantityBuilder() | ||
| .withAmount("1Gi").build()).asJava).build()) | ||
|
There was a problem hiding this comment. does a gig pose any potential problems as being too large in a testing environment? There was a problem hiding this comment. I had that question too, but thought its low anyway given that minikube itself sets as default 16GB on the host to be available. |
||
| .endSpec() | ||
|
|
||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .storage() | ||
| .storageClasses() | ||
| .create(scBuilder.build()) | ||
|
|
||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .persistentVolumes() | ||
| .create(pvBuilder.build()) | ||
|
|
||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .persistentVolumeClaims() | ||
| .create(pvcBuilder.build()) | ||
| } | ||
|
|
||
| private def deleteLocalStorage(): Unit = { | ||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .persistentVolumeClaims() | ||
| .withName(PVC_NAME) | ||
| .delete() | ||
|
|
||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .persistentVolumes() | ||
| .withName(PV_NAME) | ||
| .delete() | ||
|
|
||
| kubernetesTestComponents | ||
| .kubernetesClient | ||
| .storage() | ||
| .storageClasses() | ||
| .withName(STORAGE_NAME) | ||
| .delete() | ||
| } | ||
|
|
||
| private def checkPVs(pod: Pod, file: String) = { | ||
| Eventually.eventually(TIMEOUT, INTERVAL) { | ||
| implicit val podName: String = pod.getMetadata.getName | ||
| implicit val components: KubernetesTestComponents = kubernetesTestComponents | ||
| val contents = Utils.executeCommand("cat", s"$CONTAINER_MOUNT_PATH/$file") | ||
| assert(contents.toString.trim.equals(FILE_CONTENTS)) | ||
| } | ||
| } | ||
|
|
||
| private def createTempFile(): String = { | ||
| val filename = try { | ||
| val f = File.createTempFile("tmp", ".txt", new File(HOST_PATH)) | ||
shaneknapp marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| f.deleteOnExit() | ||
| new PrintWriter(f) { | ||
| try { | ||
| write(FILE_CONTENTS) | ||
| } finally { | ||
| close() | ||
| } | ||
| } | ||
| f.getName | ||
| } catch { | ||
| case e: Exception => e.printStackTrace(); throw e; | ||
| } | ||
| filename | ||
| } | ||
|
|
||
| test("Test PVs with local storage", k8sTestTag, MinikubeTag) { | ||
| sparkAppConf | ||
| .set(s"spark.kubernetes.driver.volumes.persistentVolumeClaim.data.mount.path", | ||
| CONTAINER_MOUNT_PATH) | ||
| .set(s"spark.kubernetes.driver.volumes.persistentVolumeClaim.data.options.claimName", | ||
| PVC_NAME) | ||
| .set(s"spark.kubernetes.executor.volumes.persistentVolumeClaim.data.mount.path", | ||
| CONTAINER_MOUNT_PATH) | ||
| .set(s"spark.kubernetes.executor.volumes.persistentVolumeClaim.data.options.claimName", | ||
| PVC_NAME) | ||
| val file = createTempFile() | ||
| try { | ||
| setupLocalStorage() | ||
| runDFSReadWriteAndVerifyCompletion( | ||
| FILE_CONTENTS.split(" ").length, | ||
| driverPodChecker = (driverPod: Pod) => { | ||
| doBasicDriverPodCheck(driverPod) | ||
| checkPVs(driverPod, file) | ||
| }, | ||
| executorPodChecker = (executorPod: Pod) => { | ||
| doBasicExecutorPodCheck(executorPod) | ||
| checkPVs(executorPod, file) | ||
| }, | ||
| appArgs = Array(s"$CONTAINER_MOUNT_PATH/$file", s"$CONTAINER_MOUNT_PATH"), | ||
| interval = Some(PV_TESTS_INTERVAL) | ||
| ) | ||
| } finally { | ||
| // make sure this always run | ||
| deleteLocalStorage() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private[spark] object PVTestsSuite { | ||
| val MinikubeTag = Tag("minikube") | ||
| val STORAGE_NAME = "test-local-storage" | ||
| val PV_NAME = "test-local-pv" | ||
| val PVC_NAME = "test-local-pvc" | ||
| val CONTAINER_MOUNT_PATH = "/opt/spark/pv-tests" | ||
| val HOST_PATH = sys.env.getOrElse("PVC_TESTS_HOST_PATH", "/tmp") | ||
| val VM_PATH = sys.env.getOrElse("PVC_TESTS_VM_PATH", "/tmp") | ||
| val FILE_CONTENTS = "test PVs" | ||
| val PV_TESTS_INTERVAL = PatienceConfiguration.Interval(Span(10, Milliseconds)) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I need to delete the file upfront, otherwise if it is already there due to a previous run, tests will fail.
I cannot delete it from within the test suite because permissions are 185:root.
So I have to delete it from Spark.