issue fix 4874 update

Signed-off-by: Lyndon-Li <[email protected]>

changelogs/unreleased/5319-lyndon

@@ -0,0 +1 @@
+Fix issue 4874 and 4752: check the daemonset pod is running in the node where the workload pod resides before running the PVB for the pod

pkg/cmd/server/server.go

@@ -533,11 +533,11 @@ var defaultRestorePriorities = []string{
 }
 
 func (s *server) initRestic() error {
-	// warn if restic daemonset does not exist
+	// warn if node agent does not exist
 	if err := nodeagent.IsRunning(s.ctx, s.kubeClient, s.namespace); err == nodeagent.DaemonsetNotFound {
-		s.logger.Warn("Velero restic daemonset not found; restic backups/restores will not work until it's created")
+		s.logger.Warn("Velero node agent not found; pod volume backups/restores will not work until it's created")
 	} else if err != nil {
-		s.logger.WithError(errors.WithStack(err)).Warn("Error checking for existence of velero restic daemonset")
+		s.logger.WithError(errors.WithStack(err)).Warn("Error checking for existence of velero node agent")
 	}
 
 	// ensure the repo key secret is set up

pkg/nodeagent/node_agent.go

@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	// daemonSet is the name of the Velero restic daemonset.
+	// daemonSet is the name of the Velero node agent daemonset.
 	daemonSet = "restic"
 )
 
@@ -48,7 +48,7 @@ func IsRunning(ctx context.Context, kubeClient kubernetes.Interface, namespace s
 	}
 }
 
-// IsRunningInNode checks if the node agent daemonset pod is running properly in a specified node. If not, return the error found
+// IsRunningInNode checks if the node agent pod is running properly in a specified node. If not, return the error found
 func IsRunningInNode(ctx context.Context, namespace string, nodeName string, podClient corev1client.PodsGetter) error {
 	if nodeName == "" {
 		return errors.New("node name is empty")

pkg/podvolume/backupper.go

@@ -125,7 +125,7 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api.
 		return nil, []error{err}
 	}
 
-	err = IsPodQualified(pod)
+	err = isPodQualified(pod)
 	if err != nil {
 		return nil, []error{err}
 	}

pkg/podvolume/util.go

@@ -297,15 +297,15 @@ func GetPodVolumesUsingRestic(pod *corev1api.Pod, defaultVolumesToRestic bool) [
 	return podVolumes
 }
 
-// IsPodQualified checks if the pod's status is qualified for a PVB/PVR to backup/restore its volumes.
+// isPodQualified checks if the pod's status is qualified for a PVB/PVR to backup/restore its volumes.
 // If no, return the error found
-func IsPodQualified(pod *corev1api.Pod) error {
+func isPodQualified(pod *corev1api.Pod) error {
 	if pod.Spec.NodeName == "" {
-		return errors.Errorf("pod is not scheduled, name=%s, namespace=%s, status=%s", pod.Name, pod.Namespace, pod.Status.Phase)
+		return errors.Errorf("pod is not scheduled, name=%s, namespace=%s, phase=%s", pod.Name, pod.Namespace, pod.Status.Phase)
 	}
 
 	if pod.Status.Phase != corev1api.PodRunning {
-		return errors.Errorf("pod is not running, name=%s, namespace=%s, status=%s", pod.Name, pod.Namespace, pod.Status.Phase)
+		return errors.Errorf("pod is not running, name=%s, namespace=%s, phase=%s", pod.Name, pod.Namespace, pod.Status.Phase)
 	}
 
 	return nil