Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split GetClassFromVolumeSnapshot to two functions
This commit splits GetClassFromVolumeSnapshot to two functions, GetSnapshotClass and SetDefaultSnapshotClass.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -447,11 +447,22 @@ func (ctrl *csiSnapshotController) createSnapshotOperation(snapshot *crdv1.Volum | |
| glog.V(4).Infof("error is already set in snapshot, do not retry to create: %s", snapshot.Status.Error.Message) | ||
| return snapshot, nil | ||
| } | ||
|
|
||
| className := snapshot.Spec.VolumeSnapshotClassName | ||
| glog.V(5).Infof("createSnapshotOperation [%s]: VolumeSnapshotClassName [%s]", snapshot.Name, className) | ||
| var class *crdv1.VolumeSnapshotClass | ||
| var err error | ||
| if len(className) > 0 { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
xing-yang
Author
Collaborator
|
||
| class, err = ctrl.GetSnapshotClass(className) | ||
| if err != nil { | ||
| glog.Errorf("createSnapshotOperation failed to getClassFromVolumeSnapshot %s", err) | ||
| return nil, err | ||
| } | ||
| } else { | ||
| glog.Errorf("failed to take snapshot %s without a snapshot class", snapshot.Name) | ||
| return nil, fmt.Errorf("failed to take snapshot %s without a snapshot class", snapshot.Name) | ||
| } | ||
|
|
||
| volume, err := ctrl.getVolumeFromVolumeSnapshot(snapshot) | ||
| if err != nil { | ||
| glog.Errorf("createSnapshotOperation failed to get PersistentVolume object [%s]: Error: [%#v]", snapshot.Name, err) | ||
|
|
@@ -504,7 +515,7 @@ func (ctrl *csiSnapshotController) createSnapshotOperation(snapshot *crdv1.Volum | |
| Namespace: snapshot.Namespace, | ||
| Name: snapshot.Name, | ||
| UID: snapshot.UID, | ||
| APIVersion: "snapshot.storage.k8s.io/v1alpha1", | ||
| }, | ||
| PersistentVolumeRef: volumeRef, | ||
| VolumeSnapshotSource: crdv1.VolumeSnapshotSource{ | ||
|
|
@@ -727,75 +738,75 @@ func (ctrl *csiSnapshotController) getStorageClassFromVolumeSnapshot(snapshot *c | |
| return storageclass, nil | ||
| } | ||
|
|
||
| // GetSnapshotClass is a helper function to get snapshot class from the class name. | ||
| func (ctrl *csiSnapshotController) GetSnapshotClass(className string) (*crdv1.VolumeSnapshotClass, error) { | ||
| glog.V(5).Infof("getSnapshotClass: VolumeSnapshotClassName [%s]", className) | ||
|
|
||
| obj, found, err := ctrl.classStore.GetByKey(className) | ||
| if found { | ||
| class, ok := obj.(*crdv1.VolumeSnapshotClass) | ||
| if ok { | ||
| return class, nil | ||
| } | ||
| } | ||
| class, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshotClasses().Get(className, metav1.GetOptions{}) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
||
| if err != nil { | ||
| glog.Errorf("failed to retrieve snapshot class %s from the API server: %q", className, err) | ||
| return nil, fmt.Errorf("failed to retrieve snapshot class %s from the API server: %q", className, err) | ||
| } | ||
| _, updateErr := ctrl.storeClassUpdate(class) | ||
| if updateErr != nil { | ||
| glog.V(4).Infof("getSnapshotClass [%s]: cannot update internal cache: %v", class.Name, updateErr) | ||
| } | ||
| return class, nil | ||
| } | ||
|
|
||
| // SetDefaultSnapshotClass is a helper function to figure out the default snapshot class from | ||
| // PVC/PV StorageClass and update VolumeSnapshot with this snapshot class name. | ||
| func (ctrl *csiSnapshotController) SetDefaultSnapshotClass(snapshot *crdv1.VolumeSnapshot) (*crdv1.VolumeSnapshotClass, *crdv1.VolumeSnapshot, error) { | ||
| glog.V(5).Infof("SetDefaultSnapshotClass for snapshot [%s]", snapshot.Name) | ||
|
|
||
| storageclass, err := ctrl.getStorageClassFromVolumeSnapshot(snapshot) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| // Find default snapshot class if available | ||
| list, err := ctrl.classLister.List(labels.Everything()) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| defaultClasses := []*crdv1.VolumeSnapshotClass{} | ||
|
|
||
| for _, class := range list { | ||
| if IsDefaultAnnotation(class.ObjectMeta) && storageclass.Provisioner == class.Snapshotter { | ||
This comment has been minimized.
Sorry, something went wrong. 
jingxu97
Collaborator
|
||
| defaultClasses = append(defaultClasses, class) | ||
| glog.V(5).Infof("get defaultClass added: %s", class.Name) | ||
| } | ||
| } | ||
| if len(defaultClasses) == 0 { | ||
| return nil, nil, fmt.Errorf("cannot find default snapshot class") | ||
| } | ||
| if len(defaultClasses) > 1 { | ||
| glog.V(4).Infof("get DefaultClass %d defaults found", len(defaultClasses)) | ||
| return nil, nil, fmt.Errorf("%d default snapshot classes were found", len(defaultClasses)) | ||
| } | ||
| glog.V(5).Infof("setDefaultSnapshotClass [%s]: default VolumeSnapshotClassName [%s]", snapshot.Name, defaultClasses[0]) | ||
| snapshotClone := snapshot.DeepCopy() | ||
| snapshotClone.Spec.VolumeSnapshotClassName = defaultClasses[0].Name | ||
| newSnapshot, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshots(snapshotClone.Namespace).Update(snapshotClone) | ||
| if err != nil { | ||
| glog.V(4).Infof("updating VolumeSnapshot[%s] default class failed %v", snapshotKey(snapshot), err) | ||
| } | ||
| _, updateErr := ctrl.storeSnapshotUpdate(newSnapshot) | ||
| if updateErr != nil { | ||
| // We will get an "snapshot update" event soon, this is not a big error | ||
| glog.V(4).Infof("setDefaultSnapshotClass [%s]: cannot update internal cache: %v", snapshotKey(snapshot), updateErr) | ||
| } | ||
| _, updateErr = ctrl.storeClassUpdate(defaultClasses[0]) | ||
| if updateErr != nil { | ||
| glog.V(4).Infof("setDefaultSnapshotClass [%s]: cannot update internal cache: %v", defaultClasses[0].Name, updateErr) | ||
| } | ||
| return defaultClasses[0], newSnapshot, nil | ||
| } | ||
|
|
||
| // getClaimFromVolumeSnapshot is a helper function to get PVC from VolumeSnapshot. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When createSnapshotOperation is called, snapshotClassName should be already set and it matches the driver name. But just to be safe, we can add a check for nil, and return error. Don' t need to check empty string here because shouldProcessSnapshot should already return error for empty snapshotClassName.