mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-17 20:56:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix nil pointer dereference in EnsureDeleteVS and EnsureDeleteVSC timeout paths (#10292)

Browse Source 
* fix nil pointer dereference in EnsureDeleteVS and EnsureDeleteVSC timeouts

Signed-off-by: samay43 <samayrbhat43@gmail.com>

* add changelog entry

Signed-off-by: samay43 <samayrbhat43@gmail.com>

---------

Signed-off-by: samay43 <samayrbhat43@gmail.com>
This commit is contained in:
R4mbo
2026-08-17 16:55:14 +08:00
committed by GitHub
parent da5bee7097
commit b8de7ba506
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/10292-samay43
+1
View File
@@ -0,0 +1 @@
Fix nil pointer dereference in EnsureDeleteVS and EnsureDeleteVSC when the API call times out before the object is retrieved
pkg/util/csi/volume_snapshot.go
+12
View File
@@ -187,6 +187,12 @@ func EnsureDeleteVS(ctx context.Context, snapshotClient snapshotter.SnapshotV1In
if err != nil {
if errors.Is(err, context.DeadlineExceeded) {
// updated is only set once the VS has been retrieved successfully, so it
// is still nil when the deadline is exceeded before that happens, e.g.
// when the first Get times out. No finalizers are available to report.
if updated == nil {
return errors.Errorf("timeout to assure VolumeSnapshot %s is deleted", vsName)
}
return errors.Errorf("timeout to assure VolumeSnapshot %s is deleted, finalizers in VS %v", vsName, updated.Finalizers)
} else {
return errors.Wrapf(err, "error to assure VolumeSnapshot is deleted, %s", vsName)
@@ -246,6 +252,12 @@ func EnsureDeleteVSC(ctx context.Context, snapshotClient snapshotter.SnapshotV1I
if err != nil {
if errors.Is(err, context.DeadlineExceeded) {
// updated is only set once the VSC has been retrieved successfully, so it
// is still nil when the deadline is exceeded before that happens, e.g.
// when the first Get times out. No finalizers are available to report.
if updated == nil {
return errors.Errorf("timeout to assure VolumeSnapshotContent %s is deleted", vscName)
}
return errors.Errorf("timeout to assure VolumeSnapshotContent %s is deleted, finalizers in VSC %v", vscName, updated.Finalizers)
} else {
return errors.Wrapf(err, "error to assure VolumeSnapshotContent is deleted, %s", vscName)
pkg/util/csi/volume_snapshot_test.go
+45
View File
@@ -377,6 +377,29 @@ func TestEnsureDeleteVS(t *testing.T) {
},
err: "timeout to assure VolumeSnapshot fake-vs is deleted, finalizers in VS []",
},
{
name: "wait timeout before the VS is ever retrieved",
vsName: "fake-vs",
namespace: "fake-ns",
clientObj: []runtime.Object{vsObjWithFinalizer},
reactors: []reactor{
{
verb: "delete",
resource: "volumesnapshots",
reactorFunc: func(action clientTesting.Action) (handled bool, ret runtime.Object, err error) {
return true, nil, nil
},
},
{
verb: "get",
resource: "volumesnapshots",
reactorFunc: func(action clientTesting.Action) (handled bool, ret runtime.Object, err error) {
return true, nil, context.DeadlineExceeded
},
},
},
err: "timeout to assure VolumeSnapshot fake-vs is deleted",
},
{
name: "success",
vsName: "fake-vs",
@@ -488,6 +511,28 @@ func TestEnsureDeleteVSC(t *testing.T) {
},
err: "timeout to assure VolumeSnapshotContent fake-vsc is deleted, finalizers in VSC []",
},
{
name: "wait timeout before the VSC is ever retrieved",
vscName: "fake-vsc",
clientObj: []runtime.Object{vscObjWithFinalizer},
reactors: []reactor{
{
verb: "delete",
resource: "volumesnapshotcontents",
reactorFunc: func(action clientTesting.Action) (handled bool, ret runtime.Object, err error) {
return true, nil, nil
},
},
{
verb: "get",
resource: "volumesnapshotcontents",
reactorFunc: func(action clientTesting.Action) (handled bool, ret runtime.Object, err error) {
return true, nil, context.DeadlineExceeded
},
},
},
err: "timeout to assure VolumeSnapshotContent fake-vsc is deleted",
},
{
name: "success",
vscName: "fake-vsc",