pb-3831: In csi driver CancelRestore, cleaning up dangling PVC, if re…

…store is not succeed and retain as well
libopenstorage · May 5, 2023 · 2bebe98 · 2bebe98
1 parent 02e966a
commit 2bebe98
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/volume/csi/csi.go b/drivers/volume/csi/csi.go
@@ -1683,7 +1683,10 @@ func (c *csi) CancelRestore(restore *storkapi.ApplicationRestore) error {
 		if vrInfo.DriverName != storkvolume.CSIDriverName {
 			continue
 		}
-		pvcRestoreSucceeded := (vrInfo.Status == storkapi.ApplicationRestoreStatusPartialSuccess || vrInfo.Status == storkapi.ApplicationRestoreStatusSuccessful)
+		// For existing volume, the status will be retained.
+		pvcRestoreSucceeded := (vrInfo.Status == storkapi.ApplicationRestoreStatusPartialSuccess ||
+			vrInfo.Status == storkapi.ApplicationRestoreStatusSuccessful ||
+			vrInfo.Status == storkapi.ApplicationRestoreStatusRetained)
 
 		// Only clean up dangling PVC if it's restore did not succeed
 		if !pvcRestoreSucceeded {