From 70677076d954d0572a8fa1a29df7933e549234d1 Mon Sep 17 00:00:00 2001
From: Vincent Liu <shuntian.liu2@cloud.com>
Date: Mon, 4 Nov 2024 15:18:44 +0000
Subject: [PATCH] CP-45016: Clean up the source VM earlier

Previously the source VM is cleaned up at the very end of the migration,
after the destination VM is up and running. This has caused problems for
SMAPIv3 SRs as the new VM needs to plug in the new VBD which requires a
datapath activate on the VDI which is currently in use by the old VM
(and the mirroring process). This window needs to be reduced since we
cannot have two datapath activated at the same time.

Signed-off-by: Vincent Liu <shuntian.liu2@cloud.com>
---
 ocaml/xenopsd/lib/xenops_server.ml | 52 +++++++++++++++++-------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/ocaml/xenopsd/lib/xenops_server.ml b/ocaml/xenopsd/lib/xenops_server.ml
index 579ce5d6f0..ae0af9fbd8 100644
--- a/ocaml/xenopsd/lib/xenops_server.ml
+++ b/ocaml/xenopsd/lib/xenops_server.ml
@@ -2726,7 +2726,35 @@ and perform_exn ?subtask ?result (op : operation) (t : Xenops_task.task_handle)
             ) ;
             debug "VM.migrate: Synchronisation point 1"
           in
+          let clean_src_vm () =
+            debug
+              "VM.migrate: clean up src vm before allowing destination to \
+               proceed" ;
+            (* cleanup tmp src VM *)
+            let atomics =
+              [
+                VM_hook_script_stable
+                  ( id
+                  , Xenops_hooks.VM_pre_destroy
+                  , Xenops_hooks.reason__suspend
+                  , new_src_id
+                  )
+              ]
+              @ atomics_of_operation (VM_shutdown (new_src_id, None))
+              @ [
+                  VM_hook_script_stable
+                    ( id
+                    , Xenops_hooks.VM_post_destroy
+                    , Xenops_hooks.reason__suspend
+                    , new_src_id
+                    )
+                ; VM_remove new_src_id
+                ]
+            in
+            perform_atomics atomics t
+          in
           let final_handshake () =
+            clean_src_vm () ;
             Handshake.send vm_fd Handshake.Success ;
             debug "VM.migrate: Synchronisation point 3" ;
             match Handshake.recv vm_fd with
@@ -2784,29 +2812,7 @@ and perform_exn ?subtask ?result (op : operation) (t : Xenops_task.task_handle)
                   save ~vgpu_fd:(FD vgpu_fd) ()
               ) ;
               final_handshake ()
-      ) ;
-      (* cleanup tmp src VM *)
-      let atomics =
-        [
-          VM_hook_script_stable
-            ( id
-            , Xenops_hooks.VM_pre_destroy
-            , Xenops_hooks.reason__suspend
-            , new_src_id
-            )
-        ]
-        @ atomics_of_operation (VM_shutdown (new_src_id, None))
-        @ [
-            VM_hook_script_stable
-              ( id
-              , Xenops_hooks.VM_post_destroy
-              , Xenops_hooks.reason__suspend
-              , new_src_id
-              )
-          ; VM_remove new_src_id
-          ]
-      in
-      perform_atomics atomics t
+      )
   | VM_receive_memory
       {
         vmr_id= id