Wait VolumeSnapshot's asscociated snapshot handle is created for data…

… mover PVC BIA. Continue to retry in VolumeSnapshot's BIA progress, when VS.Status reporting error, because external-snapshotter treats the error as interim, and will retry continually. Signed-off-by: Xun Jiang <[email protected]>
vmware-tanzu · Aug 10, 2023 · f312e5d · f312e5d
1 parent 8fff955
commit f312e5d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/internal/backup/pvc_action.go b/internal/backup/pvc_action.go
@@ -175,6 +175,7 @@ func (p *PVCBackupItemAction) Execute(item runtime.Unstructured, backup *velerov
 	var itemToUpdate []velero.ResourceIdentifier
 
 	if boolptr.IsSetToTrue(backup.Spec.SnapshotMoveData) {
+
 		operationID = label.GetValidName(string(velerov1api.AsyncOperationIDPrefixDataUpload) + string(backup.UID) + "." + string(pvc.UID))
 		dataUploadLog := p.Log.WithFields(logrus.Fields{
 			"Source PVC":     fmt.Sprintf("%s/%s", pvc.Namespace, pvc.Name),
@@ -183,6 +184,16 @@ func (p *PVCBackupItemAction) Execute(item runtime.Unstructured, backup *velerov
 			"Backup":         backup.Name,
 		})
 
+		// Wait until VS associated VSC snapshot handle created before returning with
+		// the Async operation for data mover.
+		_, err := util.GetVolumeSnapshotContentForVolumeSnapshot(upd, p.SnapshotClient.SnapshotV1(),
+			dataUploadLog, true, backup.Spec.CSISnapshotTimeout.Duration)
+		if err != nil {
+			dataUploadLog.Errorf("Fail to wait VolumeSnapshot snapshot handle created: %s", err.Error())
+			util.CleanupVolumeSnapshot(upd, p.SnapshotClient.SnapshotV1(), p.Log)
+			return nil, nil, "", nil, errors.WithStack(err)
+		}
+
 		dataUploadLog.Info("Starting data upload of backup")
 
 		dataUpload, err := createDataUpload(context.Background(), backup, p.VeleroClient, upd, &pvc, operationID)

diff --git a/internal/backup/volumesnapshot_action.go b/internal/backup/volumesnapshot_action.go
@@ -243,10 +243,11 @@ func (p *VolumeSnapshotBackupItemAction) Progress(operationID string, backup *ve
 	if boolptr.IsSetToTrue(vs.Status.ReadyToUse) {
 		progress.Completed = true
 	} else if vs.Status.Error != nil {
-		progress.Completed = true
+		errorMessage := ""
 		if vs.Status.Error.Message != nil {
-			progress.Err = *vs.Status.Error.Message
+			errorMessage = *vs.Status.Error.Message
 		}
+		p.Log.Warnf("VolumeSnapshot has a temporary error %s. Snapshot controller will retry later.", errorMessage)
 	}
 
 	return progress, nil