CA-78221: add a new SM call VDI.remove_from_other_config

We use this call when the storage motion is successful to remove the "base_mirror" key from other-config (this will make the mirgated VDIs to appear in XenCenter)

Author: samoht

ocaml/xapi/storage_access.ml

@@ -553,6 +553,13 @@ module SMAPIv1 = struct
 					raise (Vdi_does_not_exist vdi1)
 				| Sm.MasterOnly -> redirect sr
 
+		let remove_from_other_config context ~dbg ~sr ~vdi ~key =
+			info "VDI.update_record dbg:%s sr:%s vdi:%s" dbg sr vdi;
+			Server_helpers.exec_with_new_task "VDI.update_record" ~subtask_of:(Ref.of_string dbg)
+				(fun __context ->
+					let self = find_vdi ~__context sr vdi |> fst in
+					Db.VDI.remove_from_other_config ~__context ~self ~key)
+
 		let get_url context ~dbg ~sr ~vdi =
 			info "VDI.get_url dbg:%s sr:%s vdi:%s" dbg sr vdi;
 			(* XXX: PR-1255: tapdisk shouldn't hardcode xapi urls *)

ocaml/xapi/storage_impl.ml

@@ -515,6 +515,10 @@ module Wrapper = functor(Impl: Server_impl) -> struct
 			info "VDI.compose dbg:%s sr:%s vdi1:%s vdi2:%s" dbg sr vdi1 vdi2;
 			Impl.VDI.compose context ~dbg ~sr ~vdi1 ~vdi2
 
+		let remove_from_other_config context ~dbg ~sr ~vdi ~key =
+			info "VDI.remove_from_other_config dbg:%s sr:%s vdi:%s key:%s" dbg sr vdi key;
+			Impl.VDI.remove_from_other_config context ~dbg ~sr ~vdi ~key
+
 		let get_url context ~dbg ~sr ~vdi =
 			info "VDI.get_url dbg:%s sr:%s vdi:%s" dbg sr vdi;
 			Impl.VDI.get_url context ~dbg ~sr ~vdi

ocaml/xapi/storage_impl_test.ml

@@ -153,6 +153,7 @@ module Debug_print_impl = struct
 
         let get_url context ~dbg ~sr ~vdi = assert false
 		let compose context ~dbg ~sr ~vdi1 ~vdi2 = assert false
+		let remove_from_other_config context ~dbg ~sr ~vdi ~key = assert false
 		let set_content_id context ~dbg ~sr ~vdi ~content_id = assert false
 		let get_by_name context ~dbg ~sr ~name = assert false
 		let similar_content context ~dbg ~sr ~vdi = assert false

ocaml/xapi/storage_interface.ml

@@ -296,6 +296,9 @@ module VDI = struct
 
     (** [compose task sr vdi1 vdi2] layers the updates from [vdi2] onto [vdi1], modifying [vdi2] *)
     external compose : dbg:debug_info -> sr:sr -> vdi1:vdi -> vdi2:vdi -> unit = ""
+
+	(** [remove_other_config dbg sr vdi key] remove [key] from [vdi] other config *)
+	external remove_from_other_config: dbg:debug_info -> sr:sr -> vdi:vdi -> key:string -> unit = ""
 end
 
 (** [get_by_name task name] returns a vdi with [name] (which may be in any SR) *)

ocaml/xapi/storage_migrate.ml

@@ -381,6 +381,7 @@ let start' ~task ~dbg ~sr ~vdi ~dp ~url ~dest =
 			copy' ~task ~dbg ~sr ~vdi:snapshot.vdi ~url ~dest ~dest_vdi:result.Mirror.copy_diffs_to) |> vdi_info in
 		debug "Local VDI %s == remote VDI %s" snapshot.vdi new_parent.vdi;
 		Remote.VDI.compose ~dbg ~sr:dest ~vdi1:result.Mirror.copy_diffs_to ~vdi2:result.Mirror.mirror_vdi.vdi;
+		Remote.VDI.remove_from_other_config ~dbg ~sr:dest ~vdi:result.Mirror.mirror_vdi.vdi ~key:"base_mirror";
 		debug "Local VDI %s now mirrored to remote VDI: %s" local_vdi.vdi result.Mirror.mirror_vdi.vdi;
 
 		debug "Destroying dummy VDI %s on remote" result.Mirror.dummy_vdi;

ocaml/xapi/storage_mux.ml

@@ -207,6 +207,9 @@ module Mux = struct
 		let compose context ~dbg ~sr ~vdi1 ~vdi2 =
 			let module C = Client(struct let rpc = of_sr sr end) in
 			C.VDI.compose ~dbg ~sr ~vdi1 ~vdi2
+		let remove_from_other_config context ~dbg ~sr ~vdi ~key =
+			let module C = Client(struct let rpc = of_sr sr end) in
+			C.VDI.remove_from_other_config ~dbg ~sr ~vdi ~key
         let get_url context ~dbg ~sr ~vdi =
             let module C = Client(struct let rpc = of_sr sr end) in
             C.VDI.get_url ~dbg ~sr ~vdi

ocaml/xapi/storage_proxy.ml

@@ -64,6 +64,7 @@ module Proxy = functor(RPC: RPC) -> struct
 		let set_content_id _ = Client.VDI.set_content_id
 		let similar_content _ = Client.VDI.similar_content
 		let compose _ = Client.VDI.compose
+		let remove_from_other_config _ = Client.VDI.remove_from_other_config
         let get_url _ = Client.VDI.get_url
 	end