Track status of volumesnapshots to update backup via backup_operations_controller

pkg/backup/snapshots.go

@@ -2,6 +2,7 @@
 
 import (
 	"context"
+	"fmt"
 
 	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	"github.com/sirupsen/logrus"
@@ -14,6 +15,40 @@
 	"github.com/vmware-tanzu/velero/pkg/util/boolptr"
 )
 
+// Tracks volume snapshots for this backup.
+// Completion status will be updated in backup_operations_controller.go via ProgressOperations information.
+var (
+	backupVolumeSnapshotTracker map[string]map[string]bool // backup name -> namespace/volume snapshot name -> completion status
+)
+
+func TrackVolumeSnapshotsForBackup(backup *velerov1api.Backup, volumeSnapshots []snapshotv1api.VolumeSnapshot, backupLog logrus.FieldLogger) {
+	if backupVolumeSnapshotTracker == nil {
+		backupVolumeSnapshotTracker = make(map[string]map[string]bool, 0)
+	}
+	if backupVolumeSnapshotTracker[backup.Name] == nil {
+		backupVolumeSnapshotTracker[backup.Name] = make(map[string]bool, 0)
+	}
+	for _, vs := range volumeSnapshots {
+		backupVolumeSnapshotTracker[backup.Name][VolumeSnapshotStatusTrackerName(&vs)] = false
+	}
+	backupLog.Infof("Tracking %d volume snapshots for backup %s", len(volumeSnapshots), backup.Name)
+}
+
+func VolumeSnapshotStatusTrackerName(vs *snapshotv1api.VolumeSnapshot) string {
+	return fmt.Sprintf("%s/%s", vs.Namespace, vs.Name)
+}
+
+func GetVolumeSnapshotTrackerNamesForBackupName(backupName string) map[string]bool {
+	return backupVolumeSnapshotTracker[backupName]
+}
+
+func UntrackVolumeSnapshotsForBackup(backup *velerov1api.Backup) {
+	if backupVolumeSnapshotTracker == nil {
+		return
+	}
+	delete(backupVolumeSnapshotTracker, backup.Name)
+}
+
 // Common function to update the status of CSI snapshots
 // returns VolumeSnapshot, VolumeSnapshotContent, VolumeSnapshotClasses referenced
 func UpdateBackupCSISnapshotsStatus(client kbclient.Client, globalCRClient kbclient.Client, backup *velerov1api.Backup, backupLog logrus.FieldLogger) (volumeSnapshots []snapshotv1api.VolumeSnapshot, volumeSnapshotContents []snapshotv1api.VolumeSnapshotContent, volumeSnapshotClasses []snapshotv1api.VolumeSnapshotClass) {
@@ -30,6 +65,7 @@
 		if err != nil {
 			backupLog.Error(err)
 		}
+
 		volumeSnapshots = append(volumeSnapshots, vsList.Items...)
 
 		if err := client.List(context.Background(), vscList, &kbclient.ListOptions{LabelSelector: selector}); err != nil {

pkg/controller/backup_finalizer_controller.go

@@ -190,7 +190,6 @@ func (r *backupFinalizerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	backup.Status.CompletionTimestamp = &metav1.Time{Time: r.clock.Now()}
 	recordBackupMetrics(log, backup, outBackupFile, r.metrics, true)
 
-	pkgbackup.UpdateBackupCSISnapshotsStatus(r.client, r.globalCRClient, backup, log)
 	// update backup metadata in object store
 	backupJSON := new(bytes.Buffer)
 	if err := encode.To(backup, "json", backupJSON); err != nil {