Add requeue in sidecar

Author: xing-yang

pkg/sidecar-controller/snapshot_controller_base.go

@@ -168,7 +168,16 @@ func (ctrl *csiSnapshotSideCarController) contentWorker() {
 		// been add/update/sync
 		if err == nil {
 			if ctrl.isDriverMatch(content) {
-				ctrl.updateContentInCacheStore(content)
+				err = ctrl.updateContentInCacheStore(content)
+			}
+			if err != nil {
+				// If error occurs we add this item back to the queue
+				ctrl.contentQueue.AddRateLimited(keyObj)
+			} else {
+				// If no error occurs we Forget this item so it does not
+				// get queued again until another change happens
+				klog.V(4).Infof("Forget snapshotContent %q so it does not get queued again until another change happens", key)
+				ctrl.contentQueue.Forget(keyObj)
 			}
 			return false
 		}
@@ -230,15 +239,15 @@ func (ctrl *csiSnapshotSideCarController) isDriverMatch(content *crdv1.VolumeSna
 
 // updateContent runs in worker thread and handles "content added",
 // "content updated" and "periodic sync" events.
-func (ctrl *csiSnapshotSideCarController) updateContentInCacheStore(content *crdv1.VolumeSnapshotContent) {
+func (ctrl *csiSnapshotSideCarController) updateContentInCacheStore(content *crdv1.VolumeSnapshotContent) error {
 	// Store the new content version in the cache and do not process it if this is
 	// an old version.
 	new, err := ctrl.storeContentUpdate(content)
 	if err != nil {
 		klog.Errorf("%v", err)
 	}
 	if !new {
-		return
+		return nil
 	}
 	err = ctrl.syncContent(content)
 	if err != nil {
@@ -249,7 +258,9 @@ func (ctrl *csiSnapshotSideCarController) updateContentInCacheStore(content *crd
 		} else {
 			klog.Errorf("could not sync content %q: %+v", content.Name, err)
 		}
+		return err
 	}
+	return nil
 }
 
 // deleteContent runs in worker thread and handles "content deleted" event.