Skip to content

fix: improve errors when trying to load VolumeSnapshotContent #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelbeaumont wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

fix: improve errors when trying to load VolumeSnapshotContent #1486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,10 @@ const (
annModifyControllerSecretRefName = "volume.kubernetes.io/controller-modify-secret-name"
annModifyControllerSecretRefNamespace = "volume.kubernetes.io/controller-modify-secret-namespace"

snapshotNotBound = "snapshot %s not bound"
snapshotNotBound = "snapshot %s not bound"
errorGettingSnapshotContent = "error getting snapshotcontent %s for snapshot %s"
snapshotContentNotBoundToSnapshot = "snapshotcontent %s for snapshot %s is bound to a different snapshot"
snapshotDifferentDriver = "snapshotcontent %s for snapshot %s is not handled by CSI driver of StorageClass %s"

pvcCloneFinalizer = "provisioner.storage.kubernetes.io/cloning-protection"
// snapshotSourceProtectionFinalizer is managed by the external-provisioner to track
Expand Down Expand Up @@ -1309,17 +1312,17 @@ func (p *csiProvisioner) getSnapshotSource(ctx context.Context, claim *v1.Persis
snapContentObj, err := p.snapshotClient.SnapshotV1().VolumeSnapshotContents().Get(ctx, *snapshotObj.Status.BoundVolumeSnapshotContentName, metav1.GetOptions{})
if err != nil {
klog.Warningf("error getting snapshotcontent %s for snapshot %s/%s from api server: %s", *snapshotObj.Status.BoundVolumeSnapshotContentName, snapshotObj.Namespace, snapshotObj.Name, err)
return nil, fmt.Errorf(snapshotNotBound, dataSource.Name)
return nil, fmt.Errorf(errorGettingSnapshotContent, *snapshotObj.Status.BoundVolumeSnapshotContentName, dataSource.Name)
}

if snapContentObj.Spec.VolumeSnapshotRef.UID != snapshotObj.UID || snapContentObj.Spec.VolumeSnapshotRef.Namespace != snapshotObj.Namespace || snapContentObj.Spec.VolumeSnapshotRef.Name != snapshotObj.Name {
klog.Warningf("snapshotcontent %s for snapshot %s/%s is bound to a different snapshot", *snapshotObj.Status.BoundVolumeSnapshotContentName, snapshotObj.Namespace, snapshotObj.Name)
return nil, fmt.Errorf(snapshotNotBound, dataSource.Name)
return nil, fmt.Errorf(snapshotContentNotBoundToSnapshot, *snapshotObj.Status.BoundVolumeSnapshotContentName, dataSource.Name)
}

if snapContentObj.Spec.Driver != sc.Provisioner {
klog.Warningf("snapshotcontent %s for snapshot %s/%s is handled by a different CSI driver than requested by StorageClass %s", *snapshotObj.Status.BoundVolumeSnapshotContentName, snapshotObj.Namespace, snapshotObj.Name, sc.Name)
return nil, fmt.Errorf(snapshotNotBound, dataSource.Name)
return nil, fmt.Errorf(snapshotDifferentDriver, *snapshotObj.Status.BoundVolumeSnapshotContentName, dataSource.Name, sc.Name)
}

if snapshotObj.Status.ReadyToUse == nil || !*snapshotObj.Status.ReadyToUse {
Expand Down