Bring back DATA.MIRROR.stat to storage_mux

Do the same as DATA.MIRROR.list

Signed-off-by: Vincent Liu <[email protected]>

Author: Vincent-lau

ocaml/xapi-idl/storage/storage_interface.ml

@@ -1196,6 +1196,10 @@ module StorageAPI (R : RPC) = struct
           Param.mk ~name:"mirrors" TypeCombinators.(list (pair Mirror.(id, t)))
         in
         declare "DATA.MIRROR.list" [] (dbg_p @-> returning result_p err)
+
+      let stat =
+        let result_p = Param.mk ~name:"result" Mirror.t in
+        declare "DATA.MIRROR.stat" [] (dbg_p @-> id_p @-> returning result_p err)
     end
   end
 
@@ -1310,6 +1314,8 @@ module type MIRROR = sig
     context -> dbg:debug_info -> mirror_id:Mirror.id -> sr:Sr.t -> bool
 
   val list : context -> dbg:debug_info -> (Mirror.id * Mirror.t) list
+
+  val stat : context -> dbg:debug_info -> id:Mirror.id -> Mirror.t
 end
 
 module type Server_impl = sig
@@ -1791,6 +1797,7 @@ module Server (Impl : Server_impl) () = struct
         Impl.DATA.MIRROR.is_mirror_failed () ~dbg ~mirror_id ~sr
     ) ;
     S.DATA.MIRROR.list (fun dbg -> Impl.DATA.MIRROR.list () ~dbg) ;
+    S.DATA.MIRROR.stat (fun dbg id -> Impl.DATA.MIRROR.stat () ~dbg ~id) ;
     S.DATA.import_activate (fun dbg dp sr vdi vm ->
         Impl.DATA.import_activate () ~dbg ~dp ~sr ~vdi ~vm
     ) ;

ocaml/xapi-idl/storage/storage_skeleton.ml

@@ -190,6 +190,8 @@ module DATA = struct
       u "DATA.MIRROR.is_mirror_failed"
 
     let list ctx ~dbg = u "DATA.MIRROR.list"
+
+    let stat ctx ~dbg ~id = u "DATA.MIRROR.stat"
   end
 end
 

ocaml/xapi-storage-script/main.ml

@@ -1930,6 +1930,7 @@ let bind ~volume_script_dir =
   S.DATA.MIRROR.pre_deactivate_hook (u "DATA.MIRROR.pre_deactivate_hook") ;
   S.DATA.MIRROR.is_mirror_failed (u "DATA.MIRROR.is_mirror_failed") ;
   S.DATA.MIRROR.list (u "DATA.MIRROR.list") ;
+  S.DATA.MIRROR.stat (u "DATA.MIRROR.stat") ;
   S.DP.create (u "DP.create") ;
   S.TASK.cancel (u "TASK.cancel") ;
   S.TASK.list (u "TASK.list") ;

ocaml/xapi/storage_access.ml

@@ -446,7 +446,7 @@ let update_task ~__context id =
 let update_mirror ~__context id =
   try
     let dbg = Context.string_of_task __context in
-    let m = Storage_migrate.stat ~dbg ~id in
+    let m = Client.DATA.MIRROR.stat dbg id in
     if m.Mirror.failed then
       debug "Mirror %s has failed" id ;
     let task = get_mirror_task id in

ocaml/xapi/storage_mux.ml

@@ -868,6 +868,11 @@ module Mux = struct
         with_dbg ~name:"DATA.MIRROR.list" ~dbg @@ fun di ->
         info "%s dbg: %s" __FUNCTION__ dbg ;
         Storage_migrate.list ~dbg:di.log
+
+      let stat () ~dbg ~id =
+        with_dbg ~name:"DATA.MIRROR.stat" ~dbg @@ fun di ->
+        info "%s dbg: %s mirror_id: %s" __FUNCTION__ di.log id ;
+        Storage_migrate.stat ~dbg:di.log ~id
     end
   end
 

ocaml/xapi/storage_smapiv1.ml

@@ -1163,6 +1163,8 @@ module SMAPIv1 : Server_impl = struct
       let is_mirror_failed _context ~dbg:_ ~mirror_id:_ ~sr:_ = assert false
 
       let list _context ~dbg:_ = assert false
+
+      let stat _context ~dbg:_ ~id:_ = assert false
     end
   end
 

ocaml/xapi/storage_smapiv1_migrate.ml

@@ -827,4 +827,6 @@ module MIRROR : SMAPIv2_MIRROR = struct
         false
 
   let list _ctx = u __FUNCTION__
+
+  let stat _ctx = u __FUNCTION__
 end

ocaml/xapi/storage_smapiv1_wrapper.ml

@@ -1226,6 +1226,8 @@ functor
         let is_mirror_failed _context ~dbg:_ ~mirror_id:_ ~sr:_ = u __FUNCTION__
 
         let list _context ~dbg:_ = u __FUNCTION__
+
+        let stat _context ~dbg:_ ~id:_ = u __FUNCTION__
       end
     end
 

ocaml/xapi/storage_smapiv3_migrate.ml

@@ -44,4 +44,6 @@ module MIRROR : SMAPIv2_MIRROR = struct
   let pre_deactivate_hook _ctx = u __FUNCTION__
 
   let list _ctx = u __FUNCTION__
+
+  let stat _ctx = u __FUNCTION__
 end

ocaml/xapi/xapi_vm_migrate.ml

@@ -1077,7 +1077,7 @@ let vdi_copy_fun __context dbg vdi_map remote is_intra_pool remote_vdis so_far
         (None, vdi.vdi)
       ) else
         let mirrorid = task_result |> mirror_of_task dbg in
-        let m = Storage_migrate.stat ~dbg ~id:mirrorid in
+        let m = SMAPI.DATA.MIRROR.stat dbg mirrorid in
         (Some mirrorid, m.Mirror.dest_vdi)
     in
     so_far := Int64.add !so_far vconf.size ;
@@ -1106,7 +1106,7 @@ let vdi_copy_fun __context dbg vdi_map remote is_intra_pool remote_vdis so_far
         match mirror_id with
         | Some mid ->
             ignore (Storage_access.unregister_mirror mid) ;
-            let m = Storage_migrate.stat ~dbg ~id:mid in
+            let m = SMAPI.DATA.MIRROR.stat dbg mid in
             (try Storage_migrate.stop ~dbg ~id:mid with _ -> ()) ;
             m.Mirror.failed
         | None ->