From 7fdc9ddbbe8fc11588b1e92e263af22dd5e843df Mon Sep 17 00:00:00 2001 From: XsWack Date: Fri, 2 Nov 2018 10:13:04 +0800 Subject: [PATCH 1/2] Add classListerSynced for WaitForCacheSync --- pkg/controller/snapshot_controller_base.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/snapshot_controller_base.go b/pkg/controller/snapshot_controller_base.go index 245c6079..68c7829f 100644 --- a/pkg/controller/snapshot_controller_base.go +++ b/pkg/controller/snapshot_controller_base.go @@ -139,7 +139,7 @@ func (ctrl *csiSnapshotController) Run(workers int, stopCh <-chan struct{}) { glog.Infof("Starting 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") return } From a32313cccbe5d421ce70acd9e52f8ec4fb8e7b03 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Fri, 2 Nov 2018 14:52:58 +0800 Subject: [PATCH 2/2] fix initializeCaches bug --- pkg/controller/snapshot_controller_base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/snapshot_controller_base.go b/pkg/controller/snapshot_controller_base.go index 68c7829f..198a0f74 100644 --- a/pkg/controller/snapshot_controller_base.go +++ b/pkg/controller/snapshot_controller_base.go @@ -475,8 +475,8 @@ func (ctrl *csiSnapshotController) initializeCaches(snapshotLister storagelister } for _, content := range contentList { contentClone := content.DeepCopy() - if _, err = ctrl.storeSnapshotUpdate(contentClone); err != nil { - glog.Errorf("error updating volume snapshot cache: %v", err) + if _, err = ctrl.storeContentUpdate(contentClone); err != nil { + glog.Errorf("error updating volume snapshot content cache: %v", err) } }