Merge pull request #5401 from shubham-pampattiwar/add-vsc-nil-check

Add nil check before execution of csi snapshot delete
vmware-tanzu · Oct 18, 2022 · 6b2cb7a · 6b2cb7a
2 parents 9cb46de + 34cca77
commit 6b2cb7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelogs/unreleased/5401-shubham-pampattiwar b/changelogs/unreleased/5401-shubham-pampattiwar
@@ -0,0 +1 @@
+Add nil check before execution of csi snapshot delete
diff --git a/pkg/controller/backup_controller.go b/pkg/controller/backup_controller.go
@@ -707,7 +707,9 @@ func (c *backupController) runBackup(backup *pkgbackup.Request) error {
 		}
 
 		// Delete the VolumeSnapshots created in the backup, when CSI feature is enabled.
-		c.deleteVolumeSnapshot(volumeSnapshots, volumeSnapshotContents, *backup, backupLog)
+		if len(volumeSnapshots) > 0 && len(volumeSnapshotContents) > 0 {
+			c.deleteVolumeSnapshot(volumeSnapshots, volumeSnapshotContents, *backup, backupLog)
+		}
 
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add nil check before execution of csi snapshot delete