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

shouldProcessSnapshot should return *VolumeSnapshot

Browse Source 
Also rename shouldProcessSnapshot to checkAndUpdateSnapshotClass.
This commit is contained in:
Xing Yang
2018-08-24 07:01:29 -07:00
parent 4f5aec4682
commit 25be5fdffc
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/controller/snapshot_controller_base.go
View File

@@ -204,16 +204,17 @@ func (ctrl *csiSnapshotController) snapshotWorker() {
namespace, name, err := cache.SplitMetaNamespaceKey(key) namespace, name, err := cache.SplitMetaNamespaceKey(key)
glog.V(5).Infof("snapshotWorker: snapshot namespace [%s] name [%s]", namespace, name) glog.V(5).Infof("snapshotWorker: snapshot namespace [%s] name [%s]", namespace, name)
if err != nil { if err != nil {
glog.V(4).Infof("error getting namespace & name of snapshot %q to get snapshot from informer: %v", key, err) glog.Errorf("error getting namespace & name of snapshot %q to get snapshot from informer: %v", key, err)
return false return false
} }
snapshot, err := ctrl.snapshotLister.VolumeSnapshots(namespace).Get(name) snapshot, err := ctrl.snapshotLister.VolumeSnapshots(namespace).Get(name)
if err == nil { if err == nil {
// The volume snapshot still exists in informer cache, the event must have // The volume snapshot still exists in informer cache, the event must have
// been add/update/sync // been add/update/sync
if ctrl.shouldProcessSnapshot(snapshot) { newSnapshot, err := ctrl.checkAndUpdateSnapshotClass(snapshot)
glog.V(4).Infof("should process snapshot") if err == nil {
ctrl.updateSnapshot(snapshot) glog.V(5).Infof("passed checkAndUpdateSnapshotClass for snapshot %q", key)
ctrl.updateSnapshot(newSnapshot)
} }
return false return false
} }
@@ -238,8 +239,9 @@ func (ctrl *csiSnapshotController) snapshotWorker() {
glog.Errorf("expected vs, got %+v", vsObj) glog.Errorf("expected vs, got %+v", vsObj)
return false return false
} }
if ctrl.shouldProcessSnapshot(snapshot) { newSnapshot, err := ctrl.checkAndUpdateSnapshotClass(snapshot)
ctrl.deleteSnapshot(snapshot) if err == nil {
ctrl.deleteSnapshot(newSnapshot)
} }
return false return false
} }
@@ -321,36 +323,37 @@ func (ctrl *csiSnapshotController) contentWorker() {
} }
} }
// shouldProcessSnapshot detect if snapshotter in the VolumeSnapshotClass is the same as the snapshotter // checkAndUpdateSnapshotClass gets the VolumeSnapshotClass from VolumeSnapshot. If it is not set,
// in external controller. // gets it from default VolumeSnapshotClass and sets it. It also detects if snapshotter in the
func (ctrl *csiSnapshotController) shouldProcessSnapshot(snapshot *crdv1.VolumeSnapshot) bool { // VolumeSnapshotClass is the same as the snapshotter in external controller.
func (ctrl *csiSnapshotController) checkAndUpdateSnapshotClass(snapshot *crdv1.VolumeSnapshot) (*crdv1.VolumeSnapshot, error) {
className := snapshot.Spec.VolumeSnapshotClassName className := snapshot.Spec.VolumeSnapshotClassName
var class *crdv1.VolumeSnapshotClass var class *crdv1.VolumeSnapshotClass
var err error var err error
if className != nil { if className != nil {
glog.V(5).Infof("shouldProcessSnapshot [%s]: VolumeSnapshotClassName [%s]", snapshot.Name, *className) glog.V(5).Infof("checkAndUpdateSnapshotClass [%s]: VolumeSnapshotClassName [%s]", snapshot.Name, *className)
class, err = ctrl.GetSnapshotClass(*className) class, err = ctrl.GetSnapshotClass(*className)
if err != nil { if err != nil {
glog.Errorf("shouldProcessSnapshot failed to getSnapshotClass %s", err) glog.Errorf("checkAndUpdateSnapshotClass failed to getSnapshotClass %v", err)
ctrl.updateSnapshotErrorStatusWithEvent(snapshot, v1.EventTypeWarning, "GetSnapshotClassFailed", fmt.Sprintf("Failed to get snapshot class with error %v", err)) ctrl.updateSnapshotErrorStatusWithEvent(snapshot, v1.EventTypeWarning, "GetSnapshotClassFailed", fmt.Sprintf("Failed to get snapshot class with error %v", err))
return false return nil, err
} }
} else { } else {
glog.V(5).Infof("shouldProcessSnapshot [%s]: SetDefaultSnapshotClass", snapshot.Name) glog.V(5).Infof("checkAndUpdateSnapshotClass [%s]: SetDefaultSnapshotClass", snapshot.Name)
class, snapshot, err = ctrl.SetDefaultSnapshotClass(snapshot) class, snapshot, err = ctrl.SetDefaultSnapshotClass(snapshot)
if err != nil { if err != nil {
glog.Errorf("shouldProcessSnapshot failed to setDefaultClass %s", err) glog.Errorf("checkAndUpdateSnapshotClass failed to setDefaultClass %v", err)
ctrl.updateSnapshotErrorStatusWithEvent(snapshot, v1.EventTypeWarning, "SetDefaultSnapshotClassFailed", fmt.Sprintf("Failed to set default snapshot class with error %v", err)) ctrl.updateSnapshotErrorStatusWithEvent(snapshot, v1.EventTypeWarning, "SetDefaultSnapshotClassFailed", fmt.Sprintf("Failed to set default snapshot class with error %v", err))
return false return nil, err
} }
} }
glog.V(5).Infof("VolumeSnapshotClass Snapshotter [%s] Snapshot Controller snapshotterName [%s]", class.Snapshotter, ctrl.snapshotterName) glog.V(5).Infof("VolumeSnapshotClass Snapshotter [%s] Snapshot Controller snapshotterName [%s]", class.Snapshotter, ctrl.snapshotterName)
if class.Snapshotter != ctrl.snapshotterName { if class.Snapshotter != ctrl.snapshotterName {
glog.V(4).Infof("Skipping VolumeSnapshot %s for snapshotter [%s] in VolumeSnapshotClass because it does not match with the snapshotter for controller [%s]", snapshotKey(snapshot), class.Snapshotter, ctrl.snapshotterName) glog.V(4).Infof("Skipping VolumeSnapshot %s for snapshotter [%s] in VolumeSnapshotClass because it does not match with the snapshotter for controller [%s]", snapshotKey(snapshot), class.Snapshotter, ctrl.snapshotterName)
return false return nil, err
} }
return true return snapshot, nil
} }
// updateSnapshot runs in worker thread and handles "snapshot added", // updateSnapshot runs in worker thread and handles "snapshot added",