Merge pull request #502 from huffmanca/address-content-nil-error

k8s-ci-robot · web-flow · commit dc7908e61598 · 2021-04-21T19:13:43.000-07:00
Correct snapshotContent error propagation
diff --git a/pkg/sidecar-controller/snapshot_controller.go b/pkg/sidecar-controller/snapshot_controller.go
@@ -300,8 +300,8 @@ func (ctrl *csiSnapshotSideCarController) createSnapshotWrapper(content *crdv1.V
 		// storage system has responded with an error
 		klog.Infof("createSnapshotWrapper: CreateSnapshot for content %s returned error: %v", content.Name, err)
 		if isCSIFinalError(err) {
-			if err := ctrl.removeAnnVolumeSnapshotBeingCreated(content); err != nil {
-				return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %s", content.Name, err)
+			if removeAnnotationErr := ctrl.removeAnnVolumeSnapshotBeingCreated(content); removeAnnotationErr != nil {
+				return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %s", content.Name, removeAnnotationErr)
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ func (ctrl csiSnapshotSideCarController) createSnapshotWrapper(content crdv1.V`
`300`	`300`	`// storage system has responded with an error`
`301`	`301`	`klog.Infof("createSnapshotWrapper: CreateSnapshot for content %s returned error: %v", content.Name, err)`
`302`	`302`	`if isCSIFinalError(err) {`
`303`		`- if err := ctrl.removeAnnVolumeSnapshotBeingCreated(content); err != nil {`
`304`		`- return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %s", content.Name, err)`
	`303`	`+ if removeAnnotationErr := ctrl.removeAnnVolumeSnapshotBeingCreated(content); removeAnnotationErr != nil {`
	`304`	`+ return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %s", content.Name, removeAnnotationErr)`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`