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

Merge pull request #50 from wackxu/patch-1

Browse Source 
fix WaitForCacheSync and initializeCaches bug
This commit is contained in:
k8s-ci-robot
2018-11-20 11:25:55 -08:00
committed by GitHub
parent 6341e4cad3 a32313cccb
commit 2840dd887f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/snapshot_controller_base.go
View File

@@ -139,7 +139,7 @@ func (ctrl *csiSnapshotController) Run(workers int, stopCh <-chan struct{}) {
glog.Infof("Starting CSI snapshotter") glog.Infof("Starting CSI snapshotter")
defer glog.Infof("Shutting CSI snapshotter") defer glog.Infof("Shutting CSI snapshotter")
if !cache.WaitForCacheSync(stopCh, ctrl.snapshotListerSynced, ctrl.contentListerSynced) { if !cache.WaitForCacheSync(stopCh, ctrl.snapshotListerSynced, ctrl.contentListerSynced, ctrl.classListerSynced) {
glog.Errorf("Cannot sync caches") glog.Errorf("Cannot sync caches")
return return
} }
@@ -475,8 +475,8 @@ func (ctrl *csiSnapshotController) initializeCaches(snapshotLister storagelister
} }
for _, content := range contentList { for _, content := range contentList {
contentClone := content.DeepCopy() contentClone := content.DeepCopy()
if _, err = ctrl.storeSnapshotUpdate(contentClone); err != nil { if _, err = ctrl.storeContentUpdate(contentClone); err != nil {
glog.Errorf("error updating volume snapshot cache: %v", err) glog.Errorf("error updating volume snapshot content cache: %v", err)
} }
} }