Merge pull request #218 from ggriffiths/fix_errshadow_update_snapshotstatus

k8s-ci-robot · web-flow · commit bba358438aee · 2019-12-20T10:01:33.000-08:00
Fix err shadow in updateSnapshotStatus and add retry delay
diff --git a/pkg/common-controller/snapshot_controller.go b/pkg/common-controller/snapshot_controller.go
@@ -344,6 +344,7 @@ func (ctrl *csiSnapshotCommonController) syncUnreadySnapshot(snapshot *crdv1.Vol
 				break
 			}
 			klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)
+			time.Sleep(ctrl.createSnapshotContentInterval)
 		}
 
 		if err != nil {
@@ -406,6 +407,7 @@ func (ctrl *csiSnapshotCommonController) syncUnreadySnapshot(snapshot *crdv1.Vol
 						break
 					}
 					klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)
+					time.Sleep(ctrl.createSnapshotContentInterval)
 				}
 
 				if err != nil {
@@ -865,16 +867,17 @@ func (ctrl *csiSnapshotCommonController) bindandUpdateVolumeSnapshot(snapshotCon
 
 	// Copy the snapshot object before updating it
 	snapshotCopy := snapshotObj.DeepCopy()
-
 	// update snapshot status
+	var updateSnapshot *crdv1.VolumeSnapshot
 	for i := 0; i < ctrl.createSnapshotContentRetryCount; i++ {
 		klog.V(5).Infof("bindandUpdateVolumeSnapshot [%s]: trying to update snapshot status", utils.SnapshotKey(snapshotCopy))
-		updateSnapshot, err := ctrl.updateSnapshotStatus(snapshotCopy, snapshotContent)
+		updateSnapshot, err = ctrl.updateSnapshotStatus(snapshotCopy, snapshotContent)
 		if err == nil {
 			snapshotCopy = updateSnapshot
 			break
 		}
 		klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)
+		time.Sleep(ctrl.createSnapshotContentInterval)
 	}
 
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ func (ctrl csiSnapshotCommonController) syncUnreadySnapshot(snapshot crdv1.Vol`
`344`	`344`	`break`
`345`	`345`	`}`
`346`	`346`	`klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)`
	`347`	`+ time.Sleep(ctrl.createSnapshotContentInterval)`
`347`	`348`	`}`
`348`	`349`
`349`	`350`	`if err != nil {`
`@@ -406,6 +407,7 @@ func (ctrl csiSnapshotCommonController) syncUnreadySnapshot(snapshot crdv1.Vol`
`406`	`407`	`break`
`407`	`408`	`}`
`408`	`409`	`klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)`
	`410`	`+ time.Sleep(ctrl.createSnapshotContentInterval)`
`409`	`411`	`}`
`410`	`412`
`411`	`413`	`if err != nil {`
`@@ -865,16 +867,17 @@ func (ctrl *csiSnapshotCommonController) bindandUpdateVolumeSnapshot(snapshotCon`
`865`	`867`
`866`	`868`	`// Copy the snapshot object before updating it`
`867`	`869`	`snapshotCopy := snapshotObj.DeepCopy()`
`868`		`-`
`869`	`870`	`// update snapshot status`
	`871`	`+ var updateSnapshot *crdv1.VolumeSnapshot`
`870`	`872`	`for i := 0; i < ctrl.createSnapshotContentRetryCount; i++ {`
`871`	`873`	`klog.V(5).Infof("bindandUpdateVolumeSnapshot [%s]: trying to update snapshot status", utils.SnapshotKey(snapshotCopy))`
`872`		`- updateSnapshot, err := ctrl.updateSnapshotStatus(snapshotCopy, snapshotContent)`
	`874`	`+ updateSnapshot, err = ctrl.updateSnapshotStatus(snapshotCopy, snapshotContent)`
`873`	`875`	`if err == nil {`
`874`	`876`	`snapshotCopy = updateSnapshot`
`875`	`877`	`break`
`876`	`878`	`}`
`877`	`879`	`klog.V(4).Infof("failed to update snapshot %s status: %v", utils.SnapshotKey(snapshot), err)`
	`880`	`+ time.Sleep(ctrl.createSnapshotContentInterval)`
`878`	`881`	`}`
`879`	`882`
`880`	`883`	`if err != nil {`