CA-401242: avoid long-running, idle connections on VDI.pool_migrate, …

…backport (#6103)
xapi-project · Nov 5, 2024 · e23d3b6 · e23d3b6
2 parents 2f6028d + ef7e7d4
commit e23d3b6
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/ocaml/xapi/message_forwarding.ml b/ocaml/xapi/message_forwarding.ml
@@ -5060,17 +5060,23 @@ functor
                 in
                 (snapshot, host)
             in
+            let op session_id rpc =
+              let sync_op () =
+                Client.VDI.pool_migrate ~rpc ~session_id ~vdi ~sr ~options
+              in
+              let async_op () =
+                Client.InternalAsync.VDI.pool_migrate ~rpc ~session_id ~vdi ~sr
+                  ~options
+              in
+              Helpers.try_internal_async ~__context API.ref_VDI_of_rpc async_op
+                sync_op
+            in
             VM.reserve_memory_for_vm ~__context ~vm ~host ~snapshot
               ~host_op:`vm_migrate (fun () ->
                 with_sr_andor_vdi ~__context
                   ~vdi:(vdi, `mirror)
                   ~doc:"VDI.mirror"
-                  (fun () ->
-                    do_op_on ~local_fn ~__context ~host (fun session_id rpc ->
-                        Client.VDI.pool_migrate ~rpc ~session_id ~vdi ~sr
-                          ~options
-                    )
-                  )
+                  (fun () -> do_op_on ~local_fn ~__context ~host op)
             )
         )