Merge branch 'main' into fix/csi-pvc-action-context-and-errors

pkg/restore/actions/csi/pvc_action.go

@@ -247,8 +247,7 @@ func (p *pvcRestoreItemAction) executeWithDataMove(logger *logrus.Entry, input *
 			logger.Info("ExistingVolumeDataPolicy is in-place incremental restore and data mover is velero-block. Taking a CSI snapshot of the existing PVC as the baseline of CBT...")
 			volumeSnapshot, err = p.createVolumeSnapshot(ctx, logger, input.Restore, *existingPVC, dataUploadResult.SnapshotClass, backup.Spec.CSISnapshotTimeout.Duration)
 			if err != nil {
-				logger.Warnf("fail to create VolumeSnapshot for existing PVC %s/%s: %s, fallback to in-place full restore", existingPVC.Namespace, existingPVC.Name, err.Error())
-				restoreType = velerov1api.VolumeDataPolicyTypeFull
+				logger.Warnf("Fail to create VolumeSnapshot for existing PVC %s/%s: %s, incremental restore will be suppressed", existingPVC.Namespace, existingPVC.Name, err.Error())
 			} else {
 				defer func() {
 					if err != nil {

pkg/restore/actions/csi/pvc_action_test.go

@@ -528,7 +528,7 @@ func TestExecute(t *testing.T) {
 					ObjectMeta(builder.WithOwnerReference([]metav1.OwnerReference{{APIVersion: velerov1api.SchemeGroupVersion.String(), Kind: "Restore", Name: "testRestore", UID: "uid", Controller: boolptr.True()}}),
 						builder.WithLabelsMap(map[string]string{velerov1api.AsyncOperationIDLabel: "dd-uid.", velerov1api.RestoreNameLabel: "testRestore", velerov1api.RestoreUIDLabel: "uid"}),
 						builder.WithGenerateName("testRestore-")).Result()
-				d.Spec.RestoreType = "full"
+				d.Spec.RestoreType = "incremental"
 				d.Spec.DataMover = "velero-block"
 				return d
 			}(),