alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
xing-yang
2020-03-08 01:21:15 +00:00
parent 7930dd261d
commit 6ca7507bc3
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/sidecar-controller/snapshot_controller.go
View File

@@ -303,11 +303,7 @@ func (ctrl *csiSnapshotSideCarController) checkandUpdateContentStatusOperation(c
return updateContent, nil return updateContent, nil
} }
// The function goes through the whole snapshot creation process. // The function goes through the snapshot creation process.
// 1. Trigger the snapshot through csi storage provider.
// 2. Update VolumeSnapshot status with creationtimestamp information
// 3. Create the VolumeSnapshotContent object with the snapshot id information.
// 4. Bind the VolumeSnapshot and VolumeSnapshotContent object
func (ctrl *csiSnapshotSideCarController) createSnapshotOperation(content *crdv1.VolumeSnapshotContent) (*crdv1.VolumeSnapshotContent, error) { func (ctrl *csiSnapshotSideCarController) createSnapshotOperation(content *crdv1.VolumeSnapshotContent) (*crdv1.VolumeSnapshotContent, error) {
klog.Infof("createSnapshotOperation: Creating snapshot for content %s through the plugin ...", content.Name) klog.Infof("createSnapshotOperation: Creating snapshot for content %s through the plugin ...", content.Name)
@@ -325,12 +321,12 @@ func (ctrl *csiSnapshotSideCarController) createSnapshotOperation(content *crdv1
} }
// NOTE(xyang): handle create timeout // NOTE(xyang): handle create timeout
// Add annotation to indicate create snapshot request is // Add an annotation to indicate the snapshot creation request has been
// sent to the storage system and wait for a response of success or failure. // sent to the storage system and the controller is waiting for a response.
// Annotation will be removed only after storage system has responded // The annotation will be removed after the storage system has responded with
// with success or failure. If the request times out, retry will happen // success or permanent failure. If the request times out, annotation will
// and annotation will remain to avoid leaking of snapshot // remain on the content to avoid potential leaking of a snapshot resource on
// resources on the storage system // the storage system.
err = ctrl.setAnnVolumeSnapshotBeingCreated(content) err = ctrl.setAnnVolumeSnapshotBeingCreated(content)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to add VolumeSnapshotBeingCreated annotation on the content %s: %q", content.Name, err) return nil, fmt.Errorf("failed to add VolumeSnapshotBeingCreated annotation on the content %s: %q", content.Name, err)
@@ -341,8 +337,10 @@ func (ctrl *csiSnapshotSideCarController) createSnapshotOperation(content *crdv1
// NOTE(xyang): handle create timeout // NOTE(xyang): handle create timeout
// If it is not a timeout error, remove annotation to indicate // If it is not a timeout error, remove annotation to indicate
// storage system has responded with an error // storage system has responded with an error
klog.Infof("createSnapshotOperation: CreateSnapshot for content %s returned error: %v", content.Name, err)
if e, ok := status.FromError(err); ok { if e, ok := status.FromError(err); ok {
if e.Code() == codes.DeadlineExceeded { klog.Infof("createSnapshotOperation: CreateSnapshot for content %s error status: %+v", content.Name, e)
if e.Code() != codes.DeadlineExceeded {
err = ctrl.removeAnnVolumeSnapshotBeingCreated(content) err = ctrl.removeAnnVolumeSnapshotBeingCreated(content)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %q", content.Name, err) return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation from the content %s: %q", content.Name, err)
@@ -372,12 +370,6 @@ func (ctrl *csiSnapshotSideCarController) createSnapshotOperation(content *crdv1
return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation on the content %s: %q", content.Name, err) return nil, fmt.Errorf("failed to remove VolumeSnapshotBeingCreated annotation on the content %s: %q", content.Name, err)
} }
// Update content in the cache store
_, err = ctrl.storeContentUpdate(content)
if err != nil {
klog.Errorf("failed to update content store %v", err)
}
return content, nil return content, nil
} }