From 44be42c196bcf1ebfeb224b8c9db636ad3aa4160 Mon Sep 17 00:00:00 2001 From: David Zhu Date: Mon, 17 Sep 2018 16:37:23 -0700 Subject: [PATCH] Include PV wait confirmation for Disruptive PV tests --- test/e2e/framework/pv_util.go | 3 +++ test/e2e/storage/generic_persistent_volume-disruptive.go | 9 +++++---- test/e2e/storage/nfs_persistent_volume-disruptive.go | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/test/e2e/framework/pv_util.go b/test/e2e/framework/pv_util.go index cedb857f213..be9a157d933 100644 --- a/test/e2e/framework/pv_util.go +++ b/test/e2e/framework/pv_util.go @@ -507,6 +507,9 @@ func testPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error { // Deletes the passed-in pod and waits for the pod to be terminated. Resilient to the pod // not existing. func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) error { + if pod == nil { + return nil + } return DeletePodWithWaitByName(f, c, pod.GetName(), pod.GetNamespace()) } diff --git a/test/e2e/storage/generic_persistent_volume-disruptive.go b/test/e2e/storage/generic_persistent_volume-disruptive.go index 92b04b2af96..fdba7e78433 100644 --- a/test/e2e/storage/generic_persistent_volume-disruptive.go +++ b/test/e2e/storage/generic_persistent_volume-disruptive.go @@ -61,10 +61,11 @@ var _ = utils.SIGDescribe("GenericPersistentVolume[Disruptive]", func() { var ( clientPod *v1.Pod pvc *v1.PersistentVolumeClaim + pv *v1.PersistentVolume ) BeforeEach(func() { framework.Logf("Initializing pod and pvcs for test") - clientPod, pvc = createPodPVCFromSC(f, c, ns) + clientPod, pvc, pv = createPodPVCFromSC(f, c, ns) }) for _, test := range disruptiveTestTable { func(t disruptiveTest) { @@ -76,13 +77,13 @@ var _ = utils.SIGDescribe("GenericPersistentVolume[Disruptive]", func() { } AfterEach(func() { framework.Logf("Tearing down test spec") - tearDownTestCase(c, f, ns, clientPod, pvc, nil) + tearDownTestCase(c, f, ns, clientPod, pvc, pv, false) pvc, clientPod = nil, nil }) }) }) -func createPodPVCFromSC(f *framework.Framework, c clientset.Interface, ns string) (*v1.Pod, *v1.PersistentVolumeClaim) { +func createPodPVCFromSC(f *framework.Framework, c clientset.Interface, ns string) (*v1.Pod, *v1.PersistentVolumeClaim, *v1.PersistentVolume) { var err error test := storageClassTest{ name: "default", @@ -99,5 +100,5 @@ func createPodPVCFromSC(f *framework.Framework, c clientset.Interface, ns string By("Creating a pod with dynamically provisioned volume") pod, err := framework.CreateNginxPod(c, ns, nil, pvcClaims) Expect(err).NotTo(HaveOccurred(), "While creating pods for kubelet restart test") - return pod, pvc + return pod, pvc, pvs[0] } diff --git a/test/e2e/storage/nfs_persistent_volume-disruptive.go b/test/e2e/storage/nfs_persistent_volume-disruptive.go index 1ea9fe192bf..6482050a869 100644 --- a/test/e2e/storage/nfs_persistent_volume-disruptive.go +++ b/test/e2e/storage/nfs_persistent_volume-disruptive.go @@ -208,7 +208,7 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes[Disruptive][Flaky]", func() { AfterEach(func() { framework.Logf("Tearing down test spec") - tearDownTestCase(c, f, ns, clientPod, pvc, pv) + tearDownTestCase(c, f, ns, clientPod, pvc, pv, true /* force PV delete */) pv, pvc, clientPod = nil, nil, nil }) @@ -277,11 +277,14 @@ func initTestCase(f *framework.Framework, c clientset.Interface, pvConfig framew } // tearDownTestCase destroy resources created by initTestCase. -func tearDownTestCase(c clientset.Interface, f *framework.Framework, ns string, client *v1.Pod, pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume) { +func tearDownTestCase(c clientset.Interface, f *framework.Framework, ns string, client *v1.Pod, pvc *v1.PersistentVolumeClaim, pv *v1.PersistentVolume, forceDeletePV bool) { // Ignore deletion errors. Failing on them will interrupt test cleanup. framework.DeletePodWithWait(f, c, client) framework.DeletePersistentVolumeClaim(c, pvc.Name, ns) - if pv != nil { + if forceDeletePV { framework.DeletePersistentVolume(c, pv.Name) + return } + err := framework.WaitForPersistentVolumeDeleted(c, pv.Name, 5*time.Second, 5*time.Minute) + framework.ExpectNoError(err, "Persistent Volume %v not deleted by dynamic provisioner", pv.Name) }