Clean importer pods on success

When running with a migration that uses CDI, e.g warm migration, it may have multiple importer pods. This patch will clean up all of them for the related VM migrated once the migration completes successfully. Signed-off-by: Liran Rotenberg <[email protected]>
kubev2v · Sep 10, 2023 · fb69998 · fb69998
1 parent a1671ed
commit fb69998
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 22 deletions.
diff --git a/pkg/controller/plan/kubevirt.go b/pkg/controller/plan/kubevirt.go
@@ -219,6 +219,37 @@ func (r *KubeVirt) GetImporterPod(pvc core.PersistentVolumeClaim) (pod *core.Pod
 	return
 }
 
+// Get the importer pods for a PersistentVolumeClaim.
+func (r *KubeVirt) GetImporterPods(pvc core.PersistentVolumeClaim) (pods []core.Pod, found bool, err error) {
+	pods = []core.Pod{}
+	if pvc.Annotations[AnnImporterPodName] == "" {
+		return
+	}
+
+	podList := &core.PodList{}
+
+	err = r.Destination.Client.List(
+		context.TODO(),
+		podList,
+		&client.ListOptions{
+			Namespace:     r.Plan.Spec.TargetNamespace,
+			LabelSelector: labels.SelectorFromSet(map[string]string{"app": "containerized-data-importer"}),
+		},
+	)
+	if err != nil {
+		err = liberr.Wrap(err)
+		return
+	}
+	for _, pod := range podList.Items {
+		if strings.Contains(pod.Name, pvc.Annotations[kVM]) {
+			pods = append(pods, pod)
+		}
+	}
+
+	found = len(pods) > 0
+	return
+}
+
 // Delete the DataVolumes associated with the VM.
 func (r *KubeVirt) DeleteDataVolumes(vm *plan.VMStatus) (err error) {
 	dvs, err := r.getDVs(vm)
@@ -235,27 +266,36 @@ func (r *KubeVirt) DeleteDataVolumes(vm *plan.VMStatus) (err error) {
 	return
 }
 
-// Delete the importer pod for a PersistentVolumeClaim.
-func (r *KubeVirt) DeleteImporterPod(pvc core.PersistentVolumeClaim) (err error) {
-	var pod *core.Pod
-	var found bool
-	pod, found, err = r.GetImporterPod(pvc)
+// Delete the importer pods for a PersistentVolumeClaim.
+func (r *KubeVirt) DeleteImporterPods(pvc core.PersistentVolumeClaim) (err error) {
+	pods, found, err := r.GetImporterPods(pvc)
 	if err != nil || !found {
 		return
 	}
-	err = r.Destination.Client.Delete(context.TODO(), pod)
-	if err != nil {
-		err = liberr.Wrap(err)
-		return
+	for _, pod := range pods {
+		err = r.Destination.Client.Delete(context.TODO(), &pod)
+		if err != nil {
+			err = liberr.Wrap(err)
+			r.Log.Error(
+				err,
+				"Deleting importer pod failed.",
+				"pod",
+				path.Join(
+					pod.Namespace,
+					pod.Name),
+				"pvc",
+				pvc.Name)
+			continue
+		}
+		r.Log.Info(
+			"Deleted importer pod.",
+			"pod",
+			path.Join(
+				pod.Namespace,
+				pod.Name),
+			"pvc",
+			pvc.Name)
 	}
-	r.Log.Info(
-		"Deleted importer pod.",
-		"pod",
-		path.Join(
-			pod.Namespace,
-			pod.Name),
-		"pvc",
-		pvc.Name)
 	return
 }
 

diff --git a/pkg/controller/plan/migration.go b/pkg/controller/plan/migration.go
@@ -478,7 +478,7 @@ func (r *Migration) deleteImporterPods(vm *plan.VMStatus) (err error) {
 		return
 	}
 	for _, pvc := range pvcs {
-		err = r.kubevirt.DeleteImporterPod(pvc)
+		err = r.kubevirt.DeleteImporterPods(pvc)
 		if err != nil {
 			return
 		}
@@ -748,14 +748,15 @@ func (r *Migration) execute(vm *plan.VMStatus) (err error) {
 		// Removing unnecessary DataVolumes
 		err = r.kubevirt.DeleteDataVolumes(vm)
 		if err != nil {
-			step.AddError(err.Error())
-			err = nil
-			break
+			err = liberr.Wrap(err)
 		}
 		err = r.kubevirt.DeletePVCConsumerPod(vm)
 		if err != nil {
 			err = liberr.Wrap(err)
-			return
+		}
+		err = r.deleteImporterPods(vm)
+		if err != nil {
+			err = liberr.Wrap(err)
 		}
 		step.MarkCompleted()
 		step.Phase = Completed