fix: Do not clean PV's with a deletion timestamp

After the volume has been successfully cleaned, the deleter sends a Delete
request to the API server. It should not continue attempting to clean the PV
at this point if the object still exists, as the PV may disappear at any time,
and we don't want cleanup to be in progress when that happens.

Author: dobsonj

pkg/deleter/deleter.go

@@ -72,6 +72,11 @@ func (d *Deleter) DeletePVs() {
 		if pv.Status.Phase != v1.VolumeReleased {
 			continue
 		}
+		// Do not clean PV's that were already deleted,
+		// they may disappear at any time.
+		if !pv.DeletionTimestamp.IsZero() {
+			continue
+		}
 		name := pv.Name
 		switch pv.Spec.PersistentVolumeReclaimPolicy {
 		case v1.PersistentVolumeReclaimRetain:

pkg/deleter/deleter_test.go

@@ -70,12 +70,14 @@ type testConfig struct {
 }
 
 type testVol struct {
-	pvPhase       v1.PersistentVolumePhase
-	VolumeMode    string
-	reclaimPolicy v1.PersistentVolumeReclaimPolicy
+	pvPhase           v1.PersistentVolumePhase
+	VolumeMode        string
+	reclaimPolicy     v1.PersistentVolumeReclaimPolicy
+	deletionTimestamp *meta_v1.Time
 }
 
 func TestDeleteVolumes_Basic(t *testing.T) {
+	deletionTimestamp := meta_v1.Now()
 	vols := map[string]*testVol{
 		"pv1": {
 			pvPhase: v1.VolumePending,
@@ -96,6 +98,10 @@ func TestDeleteVolumes_Basic(t *testing.T) {
 			pvPhase:       v1.VolumeReleased,
 			reclaimPolicy: v1.PersistentVolumeReclaimRetain,
 		},
+		"pv7": {
+			pvPhase:           v1.VolumeReleased,
+			deletionTimestamp: &deletionTimestamp,
+		},
 	}
 	expectedDeletedPVs := map[string]string{"pv4": ""}
 	test := &testConfig{
@@ -580,6 +586,7 @@ func testSetup(t *testing.T, config *testConfig, cleanupCmd []string, useJobForC
 		}
 		pv := common.CreateLocalPVSpec(&lpvConfig)
 		pv.Status.Phase = vol.pvPhase
+		pv.DeletionTimestamp = vol.deletionTimestamp
 
 		_, err := config.apiUtil.CreatePV(pv)
 		if err != nil {