Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CP-45016 Implement inbound SXM for SMAPIv3 SRs #6101

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+1,160 −490
Open

CP-45016 Implement inbound SXM for SMAPIv3 SRs #6101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
135e469
Add more logging to the vhd-tool
Vincent-lau Oct 28, 2024
942db03
chore: Some housekeeping on comments and minor refactoring
Vincent-lau Oct 28, 2024
eef9299
Refactor feature processing logic in `Smint`
Vincent-lau Nov 4, 2024
7e19968
Move `transform_storage_exn` to Storage_utils
Vincent-lau Oct 31, 2024
582289c
CP-45016: Implement several SMAPIv2->SMAPIv3 APIs for SXM
Vincent-lau Oct 25, 2024
edbfa41
CP-45016: Implement `import_activate` SMAPIv2 call
Vincent-lau Dec 10, 2024
0033152
CP-45016: Add support for specifying nbd export in sparse_dd
Vincent-lau Oct 28, 2024
cd0c574
CP-45016: Implement inbound SXM SMAPIv3 SRs
Vincent-lau Oct 28, 2024
8e762f9
CP-45016: Implement checking of mirroring features
Vincent-lau Dec 10, 2024
93fe17a
CP-45016: Delay VDI.compose in SXM
Vincent-lau Nov 15, 2024
9f9ca9c
CP-45016: Implement get_nbd_server SMAPI{v1,v2,v3} calls
Vincent-lau Dec 10, 2024
5b04e69
CP-45016: Implement a new nbd proxy handler
Vincent-lau Dec 5, 2024
c34af2e
CP-45016: Clean up the source VM earlier
Vincent-lau Nov 4, 2024
fc559ea
Improve doc and logging
Vincent-lau Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ocaml/tests/test_storage_migrate_state.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ let sample_receive_state =
; leaf_dp= "leaf_dp"
; parent_vdi= Vdi.of_string "parent_vdi"
; remote_vdi= Vdi.of_string "remote_vdi"
; mirror_vm= Vm.of_string "mirror_vm"
}

let sample_copy_state =
Expand Down
18 changes: 18 additions & 0 deletions ocaml/xapi-idl/storage/storage_interface.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,10 +1054,23 @@ module StorageAPI (R : RPC) = struct
@-> returning result err
)

(** Called on the receiving end
@deprecated This function is deprecated, and is only here to keep backward
compatibility with old xapis that call Remote.DATA.MIRROR.receive_finalize
during SXM. Use the receive_finalize2 function instead.
*)
let receive_finalize =
declare "DATA.MIRROR.receive_finalize" []
(dbg_p @-> id_p @-> returning unit_p err)

(** [receive_finalize2 dbg id] will stop the mirroring process and compose
the snapshot VDI with the mirror VDI. It also cleans up the storage resources
used by mirroring. It is called after the the source VM is paused. This fucntion
should be used in conjunction with [receive_start2] *)
let receive_finalize2 =
declare "DATA.MIRROR.receive_finalize2" []
(dbg_p @-> id_p @-> returning unit_p err)

let receive_cancel =
declare "DATA.MIRROR.receive_cancel" []
(dbg_p @-> id_p @-> returning unit_p err)
Expand Down Expand Up @@ -1420,6 +1433,8 @@ module type Server_impl = sig

val receive_finalize : context -> dbg:debug_info -> id:Mirror.id -> unit

val receive_finalize2 : context -> dbg:debug_info -> id:Mirror.id -> unit

val receive_cancel : context -> dbg:debug_info -> id:Mirror.id -> unit

val list : context -> dbg:debug_info -> (Mirror.id * Mirror.t) list
Expand Down Expand Up @@ -1608,6 +1623,9 @@ module Server (Impl : Server_impl) () = struct
S.DATA.MIRROR.receive_finalize (fun dbg id ->
Impl.DATA.MIRROR.receive_finalize () ~dbg ~id
) ;
S.DATA.MIRROR.receive_finalize2 (fun dbg id ->
Impl.DATA.MIRROR.receive_finalize2 () ~dbg ~id
) ;
S.DATA.MIRROR.list (fun dbg -> Impl.DATA.MIRROR.list () ~dbg) ;
S.DATA.MIRROR.import_activate (fun dbg dp sr vdi vm ->
Impl.DATA.MIRROR.import_activate () ~dbg ~dp ~sr ~vdi ~vm
Expand Down
2 changes: 2 additions & 0 deletions ocaml/xapi-idl/storage/storage_skeleton.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ module DATA = struct

let receive_finalize ctx ~dbg ~id = u "DATA.MIRROR.receive_finalize"

let receive_finalize2 ctx ~dbg ~id = u "DATA.MIRROR.receive_finalize2"

let receive_cancel ctx ~dbg ~id = u "DATA.MIRROR.receive_cancel"

let list ctx ~dbg = u "DATA.MIRROR.list"
Expand Down
1 change: 1 addition & 0 deletions ocaml/xapi-storage-script/main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,6 +1841,7 @@ let bind ~volume_script_dir =
S.DATA.copy (u "DATA.copy") ;
S.DP.stat_vdi (u "DP.stat_vdi") ;
S.DATA.MIRROR.receive_finalize (u "DATA.MIRROR.receive_finalize") ;
S.DATA.MIRROR.receive_finalize2 (u "DATA.MIRROR.receive_finalize2") ;
S.DP.create (u "DP.create") ;
S.TASK.cancel (u "TASK.cancel") ;
S.VDI.attach (u "VDI.attach") ;
Expand Down
49 changes: 36 additions & 13 deletions ocaml/xapi/storage_migrate.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module State = struct
; leaf_dp: dp
; parent_vdi: Vdi.t
; remote_vdi: Vdi.t
; mirror_vm: Vm.t
}
[@@deriving rpcty]

Expand Down Expand Up @@ -761,7 +762,7 @@ module MigrateLocal = struct
; watchdog= None
}
in

State.add mirror_id (State.Send_op alm) ;
debug "%s Added mirror %s to active local mirrors" __FUNCTION__ mirror_id ;
(* A list of cleanup actions to perform if the operation should fail. *)
Expand Down Expand Up @@ -920,15 +921,9 @@ module MigrateLocal = struct
debug "Local VDI %s = remote VDI %s"
(Storage_interface.Vdi.string_of snapshot.vdi)
(Storage_interface.Vdi.string_of new_parent.vdi) ;
Remote.VDI.compose dbg dest result.Mirror.copy_diffs_to
result.Mirror.mirror_vdi.vdi ;
Remote.VDI.remove_from_sm_config dbg dest result.Mirror.mirror_vdi.vdi
"base_mirror" ;
debug "Local VDI %s now mirrored to remote VDI: %s"
(Storage_interface.Vdi.string_of local_vdi.vdi)
(Storage_interface.Vdi.string_of result.Mirror.mirror_vdi.vdi) ;
debug "Destroying dummy VDI on remote" ;
Remote.VDI.destroy dbg dest result.Mirror.dummy_vdi ;
debug "Destroying snapshot on src" ;
Local.VDI.destroy dbg sr snapshot.vdi ;
Some (Mirror_id mirror_id)
Expand Down Expand Up @@ -1127,7 +1122,7 @@ end
(** module [MigrateRemote] is similar to [MigrateLocal], but most of these functions
tend to be executed on the receiver side. *)
module MigrateRemote = struct
let receive_start2 ~dbg ~sr ~vdi_info ~id ~similar ~vm =
let receive_start_common ~dbg ~sr ~vdi_info ~id ~similar ~vm =
let on_fail : (unit -> unit) list ref = ref [] in
let vdis = Local.SR.scan dbg sr in
(* We drop cbt_metadata VDIs that do not have any actual data *)
Expand All @@ -1138,9 +1133,11 @@ module MigrateRemote = struct
let leaf = Local.VDI.create dbg sr vdi_info in
info "Created leaf VDI for mirror receive: %s" (string_of_vdi_info leaf) ;
on_fail := (fun () -> Local.VDI.destroy dbg sr leaf.vdi) :: !on_fail ;
(* dummy VDI is created so that the leaf VDI becomes a differencing disk,
useful for calling VDI.compose later on *)
let dummy = Local.VDI.snapshot dbg sr leaf in
on_fail := (fun () -> Local.VDI.destroy dbg sr dummy.vdi) :: !on_fail ;
debug "Created dummy snapshot for mirror receive: %s"
debug "%s Created dummy snapshot for mirror receive: %s" __FUNCTION__
(string_of_vdi_info dummy) ;
let _ : backend = Local.VDI.attach3 dbg leaf_dp sr leaf.vdi vm true in
Local.VDI.activate3 dbg leaf_dp sr leaf.vdi vm ;
Expand Down Expand Up @@ -1202,6 +1199,7 @@ module MigrateRemote = struct
; leaf_dp
; parent_vdi= parent.vdi
; remote_vdi= vdi_info.vdi
; mirror_vm= vm
}
) ;
let nearest_content_id = Option.map (fun x -> x.content_id) nearest in
Expand All @@ -1224,14 +1222,37 @@ module MigrateRemote = struct
raise e

let receive_start ~dbg ~sr ~vdi_info ~id ~similar =
receive_start2 ~dbg ~sr ~vdi_info ~id ~similar ~vm:(Vm.of_string "0")
receive_start_common ~dbg ~sr ~vdi_info ~id ~similar ~vm:(Vm.of_string "0")

let receive_start2 ~dbg ~sr ~vdi_info ~id ~similar ~vm =
receive_start_common ~dbg ~sr ~vdi_info ~id ~similar ~vm

let receive_finalize ~dbg ~id =
let recv_state = State.find_active_receive_mirror id in
let open State.Receive_state in
Option.iter (fun r -> Local.DP.destroy dbg r.leaf_dp false) recv_state ;
State.remove_receive_mirror id

let receive_finalize2 ~dbg ~id =
let recv_state = State.find_active_receive_mirror id in
let open State.Receive_state in
Option.iter
(fun r ->
SXM.info
"%s Mirror done. Compose on the dest sr %s parent %s and leaf %s"
__FUNCTION__ (Sr.string_of r.sr)
(Vdi.string_of r.parent_vdi)
(Vdi.string_of r.leaf_vdi) ;
Local.DP.destroy2 dbg r.leaf_dp r.sr r.leaf_vdi r.mirror_vm false ;
Local.VDI.compose dbg r.sr r.parent_vdi r.leaf_vdi ;
(* On SMAPIv3, compose would have removed the now invalid dummy vdi, so
there is no need to destroy it anymore, while this is necessary on SMAPIv1 SRs. *)
log_and_ignore_exn (fun () -> Local.VDI.destroy dbg r.sr r.dummy_vdi) ;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does log_and_ignore_exn produce scary errors in the logs?

Local.VDI.remove_from_sm_config dbg r.sr r.leaf_vdi "base_mirror"
)
recv_state ;
State.remove_receive_mirror id

let receive_cancel ~dbg ~id =
let receive_state = State.find_active_receive_mirror id in
let open State.Receive_state in
Expand Down Expand Up @@ -1320,11 +1341,11 @@ let post_detach_hook ~sr ~vdi ~dp:_ =
let t =
Thread.create
(fun () ->
debug "Calling receive_finalize" ;
debug "Calling receive_finalize2" ;
log_and_ignore_exn (fun () ->
Remote.DATA.MIRROR.receive_finalize "Mirror-cleanup" id
Remote.DATA.MIRROR.receive_finalize2 "Mirror-cleanup" id
) ;
debug "Finished calling receive_finalize" ;
debug "Finished calling receive_finalize2" ;
State.remove_local_mirror id ;
debug "Removed active local mirror: %s" id
)
Expand Down Expand Up @@ -1424,6 +1445,8 @@ let receive_start2 = MigrateRemote.receive_start2

let receive_finalize = MigrateRemote.receive_finalize

let receive_finalize2 = MigrateRemote.receive_finalize2

let receive_cancel = MigrateRemote.receive_cancel

(* The remote end of this call, SR.update_snapshot_info_dest, is implemented in
Expand Down
4 changes: 4 additions & 0 deletions ocaml/xapi/storage_mux.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,10 @@ module Mux = struct
with_dbg ~name:"DATA.MIRROR.receive_finalize" ~dbg
@@ fun {log= dbg; _} -> Storage_migrate.receive_finalize ~dbg

let receive_finalize2 () ~dbg =
with_dbg ~name:"DATA.MIRROR.receive_finalize2" ~dbg
@@ fun {log= dbg; _} -> Storage_migrate.receive_finalize2 ~dbg

let receive_cancel () ~dbg =
with_dbg ~name:"DATA.MIRROR.receive_cancel" ~dbg @@ fun {log= dbg; _} ->
Storage_migrate.receive_cancel ~dbg
Expand Down
2 changes: 2 additions & 0 deletions ocaml/xapi/storage_smapiv1.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,8 @@ module SMAPIv1 : Server_impl = struct

let receive_finalize _context ~dbg:_ ~id:_ = assert false

let receive_finalize2 _context ~dbg:_ ~id:_ = assert false

let receive_cancel _context ~dbg:_ ~id:_ = assert false

let import_activate _context ~dbg:_ ~dp:_ ~sr:_ ~vdi:_ ~vm:_ =
Expand Down
4 changes: 4 additions & 0 deletions ocaml/xapi/storage_smapiv1_wrapper.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,10 @@ functor
info "DATA.MIRROR.receive_finalize dbg:%s id:%s" dbg id ;
Impl.DATA.MIRROR.receive_finalize context ~dbg ~id

let receive_finalize2 context ~dbg ~id =
info "DATA.MIRROR.receive_finalize2 dbg:%s id:%s" dbg id ;
Impl.DATA.MIRROR.receive_finalize2 context ~dbg ~id

let receive_cancel context ~dbg ~id =
info "DATA.MIRROR.receive_cancel dbg:%s id:%s" dbg id ;
Impl.DATA.MIRROR.receive_cancel context ~dbg ~id
Expand Down