Merge pull request vmware-tanzu#6189 from Lyndon-Li/release-1.11

[1.11] Fix issue 6182

changelogs/unreleased/6189-Lyndon-Li

@@ -0,0 +1 @@
+Fix issue #6182. If pod is not running, don't treat it as an error, let it go and leave a warning.

pkg/podvolume/backupper.go

@@ -132,23 +132,28 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api.
 		return nil, nil
 	}
 
-	repositoryType := getRepositoryType(b.uploaderType)
-	if repositoryType == "" {
-		err := errors.Errorf("empty repository type, uploader %s", b.uploaderType)
-		return nil, []error{err}
+	err := kube.IsPodRunning(pod)
+	if err != nil {
+		for _, volumeName := range volumesToBackup {
+			err = errors.Wrapf(err, "backup for volume %s is skipped", volumeName)
+			log.WithError(err).Warn("Skip pod volume")
+		}
+
+		return nil, nil
 	}
 
-	repo, err := b.repoEnsurer.EnsureRepo(b.ctx, backup.Namespace, pod.Namespace, backup.Spec.StorageLocation, repositoryType)
+	err = nodeagent.IsRunningInNode(b.ctx, backup.Namespace, pod.Spec.NodeName, b.podClient)
 	if err != nil {
 		return nil, []error{err}
 	}
 
-	err = kube.IsPodRunning(pod)
-	if err != nil {
+	repositoryType := getRepositoryType(b.uploaderType)
+	if repositoryType == "" {
+		err := errors.Errorf("empty repository type, uploader %s", b.uploaderType)
 		return nil, []error{err}
 	}
 
-	err = nodeagent.IsRunningInNode(b.ctx, backup.Namespace, pod.Spec.NodeName, b.podClient)
+	repo, err := b.repoEnsurer.EnsureRepo(b.ctx, backup.Namespace, pod.Namespace, backup.Spec.StorageLocation, repositoryType)
 	if err != nil {
 		return nil, []error{err}
 	}