Merge pull request #138 from jingxu97/deleteTimestamp

k8s-ci-robot · web-flow · commit 5cfa08e5c929 · 2018-09-26T10:11:08.000-07:00
Add the check for deleting snapshot while creating volume
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -557,6 +557,9 @@ func (p *csiProvisioner) getVolumeContentSource(options controller.VolumeOptions
 		return nil, fmt.Errorf("snapshot %s is not Ready", options.PVC.Spec.DataSource.Name)
 	}
 
+	if snapshotObj.ObjectMeta.DeletionTimestamp != nil {
+		return nil, fmt.Errorf("snapshot %s is currently being deleted", options.PVC.Spec.DataSource.Name)
+	}
 	glog.V(5).Infof("VolumeSnapshot %+v", snapshotObj)
 
 	snapContentObj, err := p.snapshotClient.VolumesnapshotV1alpha1().VolumeSnapshotContents().Get(snapshotObj.Spec.SnapshotContentName, metav1.GetOptions{})

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,9 @@ func (p *csiProvisioner) getVolumeContentSource(options controller.VolumeOptions`
`557`	`557`	`return nil, fmt.Errorf("snapshot %s is not Ready", options.PVC.Spec.DataSource.Name)`
`558`	`558`	`}`
`559`	`559`
	`560`	`+ if snapshotObj.ObjectMeta.DeletionTimestamp != nil {`
	`561`	`+ return nil, fmt.Errorf("snapshot %s is currently being deleted", options.PVC.Spec.DataSource.Name)`
	`562`	`+ }`
`560`	`563`	`glog.V(5).Infof("VolumeSnapshot %+v", snapshotObj)`
`561`	`564`
`562`	`565`	`snapContentObj, err := p.snapshotClient.VolumesnapshotV1alpha1().VolumeSnapshotContents().Get(snapshotObj.Spec.SnapshotContentName, metav1.GetOptions{})`