Add - delete source pod after restoring

SSU-DCN · Jan 17, 2021 · 13dfd70 · 13dfd70
1 parent 1c39ba4
commit 13dfd70
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/config/samples/2.yaml b/config/samples/2.yaml
@@ -10,10 +10,11 @@ metadata:
 spec:
   containers:
   - name: vlc
-    image: lroktu/vlc-server:latest
+    image: tuongvx/vlc-app:latest
     ports:
     - containerPort: 8080
       protocol: TCP
-    args: ["big_buck_bunny.mp4","--loop","--sout", "#transcode{scodec=none}:http{mux=ffmpeg{mux=flv},dst=:8080/}"]
+    #args: ["big_buck_bunny.mp4","--loop","--sout", "#transcode{scodec=none}:http{mux=ffmpeg{mux=flv},dst=:8080/}"]
+    args: ["frozen.mp4","--loop","--sout", "#transcode{scodec=none}:http{mux=ffmpeg{mux=flv},dst=:8080/}"]
   nodeSelector:
-    kubernetes.io/hostname: worker1
+    kubernetes.io/hostname: worker2
diff --git a/config/samples/test2.yaml b/config/samples/test2.yaml
@@ -24,10 +24,10 @@ spec:
     spec:
       containers:
       - name: vlc
-        image: lroktu/vlc-server:latest
+        image: tuongvx/vlc-app:latest
         ports:
         - containerPort: 8080
           protocol: TCP
         #args: ["big_buck_bunny.mp4","--loop","--sout", "#transcode{scodec=none}:http{mux=ffmpeg{mux=flv},dst=:8080/}"]
       nodeSelector:
-        kubernetes.io/hostname: worker2
+        kubernetes.io/hostname: worker1
diff --git a/controllers/podmigration_controller.go b/controllers/podmigration_controller.go
@@ -131,22 +131,27 @@ func (r *PodmigrationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
 		}
 		log.Info("", "Live-migration", "checkpointPath"+checkpointPath)
 		log.Info("", "Live-migration", "Step 2 - Wait until checkpoint info are created - completed")
-
+		// time.Sleep(10)
 		// Step3: restore destPod from sourcePod checkpoted info
 		newPod, err := r.restorePod(ctx, pod, annotations["sourcePod"], checkpointPath)
 		if err != nil {
 			log.Error(err, "unable to restore", "pod", pod)
 			return ctrl.Result{}, err
 		}
 		log.Info("", "Live-migration", "Step 3 - Restore destPod from sourcePod's checkpointed info - completed")
-		time.Sleep(10)
-
+		time.Sleep(5)
 		// Step4: Clean checkpointpod process and checkpointPath
 		if err := r.removeCheckpointPod(ctx, copySourcePod, "/var/lib/kubelet/migration/kkk", newPod.Name, req.Namespace); err != nil {
 			log.Error(err, "unable to remove checkpoint", "pod", pod)
 			return ctrl.Result{}, err
 		}
 		log.Info("", "Live-migration", "Step 4 - Clean checkpointPod process and checkpointPath completed")
+
+		// step5: Delete source Pod
+		if err := r.deletePod(ctx, sourcePod); err != nil {
+			log.Error(err, "unable to delete", "source pod", sourcePod)
+			return ctrl.Result{}, err
+		}
 		return ctrl.Result{}, nil
 	}
 	if count == 0 {
@@ -219,6 +224,13 @@ func (r *PodmigrationReconciler) updateMultiPod(ctx context.Context, replicas in
 	return nil
 }
 
+func (r *PodmigrationReconciler) deletePod(ctx context.Context, pod *corev1.Pod) error {
+	if err := r.Delete(ctx, pod); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (r *PodmigrationReconciler) checkpointPod(ctx context.Context, pod *corev1.Pod) error {
 	snapshotPolicy := "checkpoint"
 	snapshotPath := "/var/lib/kubelet/migration/kkk"