CA-390025: do not override SR's client-set metadata on update #6165
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Pau Ruiz Safont <[email protected]>
Some plugins may not store the client-set metadata, and return a static value when replying to the update. This would override the values that a client used when the SR was created, or set afterwards, which is unexpected. Now name_label and name_description fields returned by the plugins are ignored on update. Current set_name_label and set_name_description rely on the update mechanism to work. Instead add database call at the end of the methods to ensure both xapi and the SR backend are synchronized, even when the latter fails to update the values. Signed-off-by: Pau Ruiz Safont <[email protected]>
robhoes
approved these changes
Dec 9, 2024
last-genius
approved these changes
Dec 10, 2024
edwintorok
added a commit
that referenced
this pull request
Dec 10, 2024
And solve conflicts. The conflict resolution can be reviewed locally with this command if you have a new enough version of `git`: ``` git log --remerge-diff -1 81146d223d3d5cd449105ecef713cfd57e2c1853 ``` The conflicts are mostly due to: * with_tracing being removed from the Http library * the xapi_periodic_scheduler being moved to xapi-stdext-threads * a slightly different version of the concurrent PR being merged between the 2 branches (`vm` instead of `vm'`) For convenience here is the output of that command: ```diff commit 81146d223d3d5cd449105ecef713cfd57e2c1853 Merge: 59da2e0 d8baca7 Author: Edwin Török <[email protected]> Date: Tue Dec 10 13:43:23 2024 +0000 Merge master into feature/perf Fix conflicts in http.ml (with_tracing got moved), and periodic scheduler (got moved to xapi-stdext-threads). Signed-off-by: Edwin Török <[email protected]> diff --git a/ocaml/libs/http-lib/http.ml b/ocaml/libs/http-lib/http.ml remerge CONFLICT (content): Merge conflict in ocaml/libs/http-lib/http.ml index ca635e2ba0..c979e1f7d9 100644 --- a/ocaml/libs/http-lib/http.ml +++ b/ocaml/libs/http-lib/http.ml @@ -132,16 +132,8 @@ module Hdr = struct let location = "location" -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let originator = "originator" - let traceparent = "traceparent" - -||||||| 77dd474 - let traceparent = "traceparent" - -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) let hsts = "strict-transport-security" end @@ -684,7 +676,6 @@ module Request = struct let headers, body = to_headers_and_body x in let frame_header = if x.frame then make_frame_header headers else "" in frame_header ^ headers ^ body -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let with_originator_of req f = Option.iter @@ -693,55 +684,6 @@ module Request = struct f originator ) req - - let traceparent_of req = - let open Tracing in - let ( let* ) = Option.bind in - let* traceparent = req.traceparent in - let* span_context = SpanContext.of_traceparent traceparent in - let span = Tracer.span_of_span_context span_context req.uri in - Some span - - let with_tracing ?attributes ~name req f = - let open Tracing in - let parent = traceparent_of req in - with_child_trace ?attributes parent ~name (fun (span : Span.t option) -> - match span with - | Some span -> - let traceparent = - Some (span |> Span.get_context |> SpanContext.to_traceparent) - in - let req = {req with traceparent} in - f req - | None -> - f req - ) -||||||| 77dd474 - - let traceparent_of req = - let open Tracing in - let ( let* ) = Option.bind in - let* traceparent = req.traceparent in - let* span_context = SpanContext.of_traceparent traceparent in - let span = Tracer.span_of_span_context span_context req.uri in - Some span - - let with_tracing ?attributes ~name req f = - let open Tracing in - let parent = traceparent_of req in - with_child_trace ?attributes parent ~name (fun (span : Span.t option) -> - match span with - | Some span -> - let traceparent = - Some (span |> Span.get_context |> SpanContext.to_traceparent) - in - let req = {req with traceparent} in - f req - | None -> - f req - ) -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) end module Response = struct diff --git a/ocaml/libs/http-lib/http.mli b/ocaml/libs/http-lib/http.mli remerge CONFLICT (content): Merge conflict in ocaml/libs/http-lib/http.mli index e77a9ebd5a..114ddbc4f4 100644 --- a/ocaml/libs/http-lib/http.mli +++ b/ocaml/libs/http-lib/http.mli @@ -126,22 +126,8 @@ module Request : sig val to_wire_string : t -> string (** [to_wire_string t] returns a string which could be sent to a server *) -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) val with_originator_of : t option -> (string option -> unit) -> unit - - val traceparent_of : t -> Tracing.Span.t option - - val with_tracing : - ?attributes:(string * string) list -> name:string -> t -> (t -> 'a) -> 'a -||||||| 77dd474 - - val traceparent_of : t -> Tracing.Span.t option - - val with_tracing : - ?attributes:(string * string) list -> name:string -> t -> (t -> 'a) -> 'a -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) end (** Parsed form of the HTTP response *) diff --git a/ocaml/tests/dune b/ocaml/tests/dune index b51bbca8b8..ce8fe96c19 100644 --- a/ocaml/tests/dune +++ b/ocaml/tests/dune @@ -118,6 +118,7 @@ xapi-types xapi-stdext-date xapi-stdext-threads + xapi-stdext-threads.scheduler xapi-stdext-unix xml-light2 yojson diff --git a/ocaml/tests/test_event.ml b/ocaml/tests/test_event.ml index d36dba90ef..821bb3bb52 100644 --- a/ocaml/tests/test_event.ml +++ b/ocaml/tests/test_event.ml @@ -287,7 +287,7 @@ let test_short_oneshot () = started := true ; Condition.broadcast cond ; Mutex.unlock m ; - Xapi_periodic_scheduler.loop () + Xapi_stdext_threads_scheduler.Scheduler.loop () in ignore (Thread.create scheduler ()) ; (* ensure scheduler sees an empty queue , by waiting for it to start *) @@ -303,8 +303,8 @@ let test_short_oneshot () = let fired = Atomic.make false in let fire () = Atomic.set fired true in let task = "test_oneshot" in - Xapi_periodic_scheduler.add_to_queue task Xapi_periodic_scheduler.OneShot 1. - fire ; + Xapi_stdext_threads_scheduler.Scheduler.add_to_queue task + Xapi_stdext_threads_scheduler.Scheduler.OneShot 1. fire ; Thread.delay 2. ; assert (Atomic.get fired) diff --git a/ocaml/xapi-storage-script/main.ml b/ocaml/xapi-storage-script/main.ml remerge CONFLICT (content): Merge conflict in ocaml/xapi-storage-script/main.ml index 1ec4d9dcb1..cba7ec89d5 100644 --- a/ocaml/xapi-storage-script/main.ml +++ b/ocaml/xapi-storage-script/main.ml @@ -66,7 +66,6 @@ let backend_backtrace_error name args backtrace = let missing_uri () = backend_error "MISSING_URI" ["Please include a URI in the device-config"] -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) (** return a unique 'domain' string for Dom0, so that we can plug disks multiple times (e.g. for copy). @@ -84,26 +83,6 @@ let domain_of ~dp ~vm = | _ -> vm -||||||| 77dd474 -======= -(** return a unique 'domain' string for Dom0, so that we can plug disks - multiple times (e.g. for copy). - - XAPI should give us a unique 'dp' (datapath) string, e.g. a UUID for storage migration, - or vbd/domid/device. - For regular guests keep the domain as passed by XAPI (an integer). - *) -let domain_of ~dp ~vm' = - let vm = Storage_interface.Vm.string_of vm' in - match vm with - | "0" -> - (* SM tries to use this in filesystem paths, so cannot have /, - and systemd might be a bit unhappy with - *) - "u0-" ^ dp |> String.map (function '/' | '-' -> '_' | c -> c) - | _ -> - vm - ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (** Functions to wrap calls to the above client modules and convert their exceptions and errors into SMAPIv2 errors of type [Storage_interface.Exception.exnty]. The above client modules should only @@ -1476,21 +1455,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.introduce vdi_introduce_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_attach3_impl dbg dp sr vdi' vm _readwrite = -||||||| 77dd474 - let vdi_attach3_impl dbg _dp sr vdi' vm' _readwrite = -======= - let vdi_attach3_impl dbg dp sr vdi' vm' _readwrite = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) vdi_attach_common dbg sr vdi domain >>>= fun response -> let convert_implementation = function | Xapi_storage.Data.XenDisk {params; extra; backend_type} -> @@ -1512,21 +1479,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.attach3 vdi_attach3_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_activate_common dbg dp sr vdi' vm readonly = -||||||| 77dd474 - let vdi_activate_common dbg sr vdi' vm' readonly = -======= - let vdi_activate_common dbg dp sr vdi' vm' readonly = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1551,45 +1506,17 @@ let bind ~volume_script_dir = ) |> wrap in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_activate3_impl dbg dp sr vdi' vm = vdi_activate_common dbg dp sr vdi' vm false -||||||| 77dd474 - let vdi_activate3_impl dbg _dp sr vdi' vm' = - vdi_activate_common dbg sr vdi' vm' false -======= - let vdi_activate3_impl dbg dp sr vdi' vm' = - vdi_activate_common dbg dp sr vdi' vm' false ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) in S.VDI.activate3 vdi_activate3_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_activate_readonly_impl dbg dp sr vdi' vm = vdi_activate_common dbg dp sr vdi' vm true -||||||| 77dd474 - let vdi_activate_readonly_impl dbg _dp sr vdi' vm' = - vdi_activate_common dbg sr vdi' vm' true -======= - let vdi_activate_readonly_impl dbg dp sr vdi' vm' = - vdi_activate_common dbg dp sr vdi' vm' true ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) in S.VDI.activate_readonly vdi_activate_readonly_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_deactivate_impl dbg dp sr vdi' vm = -||||||| 77dd474 - let vdi_deactivate_impl dbg _dp sr vdi' vm' = -======= - let vdi_deactivate_impl dbg dp sr vdi' vm' = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1610,21 +1537,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.deactivate vdi_deactivate_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let vdi_detach_impl dbg dp sr vdi' vm = -||||||| 77dd474 - let vdi_detach_impl dbg _dp sr vdi' vm' = -======= - let vdi_detach_impl dbg dp sr vdi' vm' = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1732,21 +1647,9 @@ let bind ~volume_script_dir = S.VDI.epoch_end vdi_epoch_end_impl ; let vdi_set_persistent_impl _dbg _sr _vdi _persistent = return () |> wrap in S.VDI.set_persistent vdi_set_persistent_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let dp_destroy2 dbg dp sr vdi' vm _allow_leak = -||||||| 77dd474 - let dp_destroy2 dbg _dp sr vdi' vm' _allow_leak = -======= - let dp_destroy2 dbg dp sr vdi' vm' _allow_leak = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1888,17 +1791,7 @@ let rec diff a b = | a :: aa -> if List.mem a b then diff aa b else a :: diff aa b -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let concurrent = ref true -||||||| 77dd474 -(* default false due to bugs in SMAPIv3 plugins, - once they are fixed this should be set to true *) -let concurrent = ref false -======= -(* default false due to bugs in SMAPIv3 plugins, - once they are fixed this should be set to true *) -let concurrent = ref true ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) type reload = All | Files of string list | Nothing diff --git a/ocaml/xapi/helpers.ml b/ocaml/xapi/helpers.ml remerge CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml index ca57afb8d8..1175b6aa03 100644 --- a/ocaml/xapi/helpers.ml +++ b/ocaml/xapi/helpers.ml @@ -410,20 +410,14 @@ let make_rpc ~__context rpc : Rpc.response = let subtask_of = Ref.string_of (Context.get_task_id __context) in let open Xmlrpc_client in let tracing = Context.set_client_span __context in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (#6150)) let dorpc, path = if !Xapi_globs.use_xmlrpc then (XMLRPC_protocol.rpc, "/") else (JSONRPC_protocol.rpc, "/jsonrpc") in - let http = xmlrpc ~subtask_of ~version:"1.1" path ~tracing in -||||||| 77dd474 - let http = xmlrpc ~subtask_of ~version:"1.1" "/" ~tracing in -======= - let http = xmlrpc ~subtask_of ~version:"1.1" "/" in + let http = xmlrpc ~subtask_of ~version:"1.1" path in let http = TraceHelper.inject_span_into_req tracing http in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (#6165)) let transport = if Pool_role.is_master () then Unix Xapi_globs.unix_domain_socket diff --git a/ocaml/xapi/xapi_periodic_scheduler_init.ml b/ocaml/xapi/xapi_periodic_scheduler_init.ml index 6300f89db2..1bd13d5f6d 100644 --- a/ocaml/xapi/xapi_periodic_scheduler_init.ml +++ b/ocaml/xapi/xapi_periodic_scheduler_init.ml @@ -129,9 +129,10 @@ let register ~__context = ) ) ; let stunnel_period = !Stunnel_cache.max_idle /. 2. in - Xapi_periodic_scheduler.add_to_queue "Check stunnel cache expiry" - (Xapi_periodic_scheduler.Periodic stunnel_period) stunnel_period - Stunnel_cache.gc ; + Xapi_stdext_threads_scheduler.Scheduler.add_to_queue + "Check stunnel cache expiry" + (Xapi_stdext_threads_scheduler.Scheduler.Periodic stunnel_period) + stunnel_period Stunnel_cache.gc ; if master && Db.Pool.get_update_sync_enabled ~__context ```
edwintorok
added a commit
to edwintorok/xen-api
that referenced
this pull request
Dec 10, 2024
And solve conflicts. The conflict resolution can be reviewed locally with this command if you have a new enough version of `git`: ``` git log --remerge-diff -1 81146d223d3d5cd449105ecef713cfd57e2c1853 ``` The conflicts are mostly due to: * with_tracing being removed from the Http library * the xapi_periodic_scheduler being moved to xapi-stdext-threads * a slightly different version of the concurrent PR being merged between the 2 branches (`vm` instead of `vm'`) For convenience here is the output of that command: ```diff commit 81146d223d3d5cd449105ecef713cfd57e2c1853 Merge: 59da2e0 d8baca7 Author: Edwin Török <[email protected]> Date: Tue Dec 10 13:43:23 2024 +0000 Merge master into feature/perf Fix conflicts in http.ml (with_tracing got moved), and periodic scheduler (got moved to xapi-stdext-threads). Signed-off-by: Edwin Török <[email protected]> diff --git a/ocaml/libs/http-lib/http.ml b/ocaml/libs/http-lib/http.ml remerge CONFLICT (content): Merge conflict in ocaml/libs/http-lib/http.ml index ca635e2ba0..c979e1f7d9 100644 --- a/ocaml/libs/http-lib/http.ml +++ b/ocaml/libs/http-lib/http.ml @@ -132,16 +132,8 @@ module Hdr = struct let location = "location" -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let originator = "originator" - let traceparent = "traceparent" - -||||||| 77dd474 - let traceparent = "traceparent" - -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) let hsts = "strict-transport-security" end @@ -684,7 +676,6 @@ module Request = struct let headers, body = to_headers_and_body x in let frame_header = if x.frame then make_frame_header headers else "" in frame_header ^ headers ^ body -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let with_originator_of req f = Option.iter @@ -693,55 +684,6 @@ module Request = struct f originator ) req - - let traceparent_of req = - let open Tracing in - let ( let* ) = Option.bind in - let* traceparent = req.traceparent in - let* span_context = SpanContext.of_traceparent traceparent in - let span = Tracer.span_of_span_context span_context req.uri in - Some span - - let with_tracing ?attributes ~name req f = - let open Tracing in - let parent = traceparent_of req in - with_child_trace ?attributes parent ~name (fun (span : Span.t option) -> - match span with - | Some span -> - let traceparent = - Some (span |> Span.get_context |> SpanContext.to_traceparent) - in - let req = {req with traceparent} in - f req - | None -> - f req - ) -||||||| 77dd474 - - let traceparent_of req = - let open Tracing in - let ( let* ) = Option.bind in - let* traceparent = req.traceparent in - let* span_context = SpanContext.of_traceparent traceparent in - let span = Tracer.span_of_span_context span_context req.uri in - Some span - - let with_tracing ?attributes ~name req f = - let open Tracing in - let parent = traceparent_of req in - with_child_trace ?attributes parent ~name (fun (span : Span.t option) -> - match span with - | Some span -> - let traceparent = - Some (span |> Span.get_context |> SpanContext.to_traceparent) - in - let req = {req with traceparent} in - f req - | None -> - f req - ) -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) end module Response = struct diff --git a/ocaml/libs/http-lib/http.mli b/ocaml/libs/http-lib/http.mli remerge CONFLICT (content): Merge conflict in ocaml/libs/http-lib/http.mli index e77a9ebd5a..114ddbc4f4 100644 --- a/ocaml/libs/http-lib/http.mli +++ b/ocaml/libs/http-lib/http.mli @@ -126,22 +126,8 @@ module Request : sig val to_wire_string : t -> string (** [to_wire_string t] returns a string which could be sent to a server *) -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) val with_originator_of : t option -> (string option -> unit) -> unit - - val traceparent_of : t -> Tracing.Span.t option - - val with_tracing : - ?attributes:(string * string) list -> name:string -> t -> (t -> 'a) -> 'a -||||||| 77dd474 - - val traceparent_of : t -> Tracing.Span.t option - - val with_tracing : - ?attributes:(string * string) list -> name:string -> t -> (t -> 'a) -> 'a -======= ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) end (** Parsed form of the HTTP response *) diff --git a/ocaml/tests/dune b/ocaml/tests/dune index b51bbca8b8..ce8fe96c19 100644 --- a/ocaml/tests/dune +++ b/ocaml/tests/dune @@ -118,6 +118,7 @@ xapi-types xapi-stdext-date xapi-stdext-threads + xapi-stdext-threads.scheduler xapi-stdext-unix xml-light2 yojson diff --git a/ocaml/tests/test_event.ml b/ocaml/tests/test_event.ml index d36dba90ef..821bb3bb52 100644 --- a/ocaml/tests/test_event.ml +++ b/ocaml/tests/test_event.ml @@ -287,7 +287,7 @@ let test_short_oneshot () = started := true ; Condition.broadcast cond ; Mutex.unlock m ; - Xapi_periodic_scheduler.loop () + Xapi_stdext_threads_scheduler.Scheduler.loop () in ignore (Thread.create scheduler ()) ; (* ensure scheduler sees an empty queue , by waiting for it to start *) @@ -303,8 +303,8 @@ let test_short_oneshot () = let fired = Atomic.make false in let fire () = Atomic.set fired true in let task = "test_oneshot" in - Xapi_periodic_scheduler.add_to_queue task Xapi_periodic_scheduler.OneShot 1. - fire ; + Xapi_stdext_threads_scheduler.Scheduler.add_to_queue task + Xapi_stdext_threads_scheduler.Scheduler.OneShot 1. fire ; Thread.delay 2. ; assert (Atomic.get fired) diff --git a/ocaml/xapi-storage-script/main.ml b/ocaml/xapi-storage-script/main.ml remerge CONFLICT (content): Merge conflict in ocaml/xapi-storage-script/main.ml index 1ec4d9dcb1..cba7ec89d5 100644 --- a/ocaml/xapi-storage-script/main.ml +++ b/ocaml/xapi-storage-script/main.ml @@ -66,7 +66,6 @@ let backend_backtrace_error name args backtrace = let missing_uri () = backend_error "MISSING_URI" ["Please include a URI in the device-config"] -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) (** return a unique 'domain' string for Dom0, so that we can plug disks multiple times (e.g. for copy). @@ -84,26 +83,6 @@ let domain_of ~dp ~vm = | _ -> vm -||||||| 77dd474 -======= -(** return a unique 'domain' string for Dom0, so that we can plug disks - multiple times (e.g. for copy). - - XAPI should give us a unique 'dp' (datapath) string, e.g. a UUID for storage migration, - or vbd/domid/device. - For regular guests keep the domain as passed by XAPI (an integer). - *) -let domain_of ~dp ~vm' = - let vm = Storage_interface.Vm.string_of vm' in - match vm with - | "0" -> - (* SM tries to use this in filesystem paths, so cannot have /, - and systemd might be a bit unhappy with - *) - "u0-" ^ dp |> String.map (function '/' | '-' -> '_' | c -> c) - | _ -> - vm - ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (** Functions to wrap calls to the above client modules and convert their exceptions and errors into SMAPIv2 errors of type [Storage_interface.Exception.exnty]. The above client modules should only @@ -1476,21 +1455,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.introduce vdi_introduce_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_attach3_impl dbg dp sr vdi' vm _readwrite = -||||||| 77dd474 - let vdi_attach3_impl dbg _dp sr vdi' vm' _readwrite = -======= - let vdi_attach3_impl dbg dp sr vdi' vm' _readwrite = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) vdi_attach_common dbg sr vdi domain >>>= fun response -> let convert_implementation = function | Xapi_storage.Data.XenDisk {params; extra; backend_type} -> @@ -1512,21 +1479,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.attach3 vdi_attach3_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_activate_common dbg dp sr vdi' vm readonly = -||||||| 77dd474 - let vdi_activate_common dbg sr vdi' vm' readonly = -======= - let vdi_activate_common dbg dp sr vdi' vm' readonly = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1551,45 +1506,17 @@ let bind ~volume_script_dir = ) |> wrap in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_activate3_impl dbg dp sr vdi' vm = vdi_activate_common dbg dp sr vdi' vm false -||||||| 77dd474 - let vdi_activate3_impl dbg _dp sr vdi' vm' = - vdi_activate_common dbg sr vdi' vm' false -======= - let vdi_activate3_impl dbg dp sr vdi' vm' = - vdi_activate_common dbg dp sr vdi' vm' false ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) in S.VDI.activate3 vdi_activate3_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_activate_readonly_impl dbg dp sr vdi' vm = vdi_activate_common dbg dp sr vdi' vm true -||||||| 77dd474 - let vdi_activate_readonly_impl dbg _dp sr vdi' vm' = - vdi_activate_common dbg sr vdi' vm' true -======= - let vdi_activate_readonly_impl dbg dp sr vdi' vm' = - vdi_activate_common dbg dp sr vdi' vm' true ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) in S.VDI.activate_readonly vdi_activate_readonly_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_deactivate_impl dbg dp sr vdi' vm = -||||||| 77dd474 - let vdi_deactivate_impl dbg _dp sr vdi' vm' = -======= - let vdi_deactivate_impl dbg dp sr vdi' vm' = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1610,21 +1537,9 @@ let bind ~volume_script_dir = |> wrap in S.VDI.deactivate vdi_deactivate_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let vdi_detach_impl dbg dp sr vdi' vm = -||||||| 77dd474 - let vdi_detach_impl dbg _dp sr vdi' vm' = -======= - let vdi_detach_impl dbg dp sr vdi' vm' = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1732,21 +1647,9 @@ let bind ~volume_script_dir = S.VDI.epoch_end vdi_epoch_end_impl ; let vdi_set_persistent_impl _dbg _sr _vdi _persistent = return () |> wrap in S.VDI.set_persistent vdi_set_persistent_impl ; -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let dp_destroy2 dbg dp sr vdi' vm _allow_leak = -||||||| 77dd474 - let dp_destroy2 dbg _dp sr vdi' vm' _allow_leak = -======= - let dp_destroy2 dbg dp sr vdi' vm' _allow_leak = ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) (let vdi = Storage_interface.Vdi.string_of vdi' in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let domain = domain_of ~dp ~vm in -||||||| 77dd474 - let domain = Storage_interface.Vm.string_of vm' in -======= - let domain = domain_of ~dp ~vm' in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) Attached_SRs.find sr >>>= fun sr -> (* Discover the URIs using Volume.stat *) stat ~dbg ~sr ~vdi >>>= fun response -> @@ -1888,17 +1791,7 @@ let rec diff a b = | a :: aa -> if List.mem a b then diff aa b else a :: diff aa b -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let concurrent = ref true -||||||| 77dd474 -(* default false due to bugs in SMAPIv3 plugins, - once they are fixed this should be set to true *) -let concurrent = ref false -======= -(* default false due to bugs in SMAPIv3 plugins, - once they are fixed this should be set to true *) -let concurrent = ref true ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) type reload = All | Files of string list | Nothing diff --git a/ocaml/xapi/helpers.ml b/ocaml/xapi/helpers.ml remerge CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml index ca57afb8d8..1175b6aa03 100644 --- a/ocaml/xapi/helpers.ml +++ b/ocaml/xapi/helpers.ml @@ -410,20 +410,14 @@ let make_rpc ~__context rpc : Rpc.response = let subtask_of = Ref.string_of (Context.get_task_id __context) in let open Xmlrpc_client in let tracing = Context.set_client_span __context in -<<<<<<< 59da2e0 (CA-388564: move qemu-dm to vm.slice (xapi-project#6150)) let dorpc, path = if !Xapi_globs.use_xmlrpc then (XMLRPC_protocol.rpc, "/") else (JSONRPC_protocol.rpc, "/jsonrpc") in - let http = xmlrpc ~subtask_of ~version:"1.1" path ~tracing in -||||||| 77dd474 - let http = xmlrpc ~subtask_of ~version:"1.1" "/" ~tracing in -======= - let http = xmlrpc ~subtask_of ~version:"1.1" "/" in + let http = xmlrpc ~subtask_of ~version:"1.1" path in let http = TraceHelper.inject_span_into_req tracing http in ->>>>>>> d8baca7 (CA-390025: do not override SR's client-set metadata on update (xapi-project#6165)) let transport = if Pool_role.is_master () then Unix Xapi_globs.unix_domain_socket diff --git a/ocaml/xapi/xapi_periodic_scheduler_init.ml b/ocaml/xapi/xapi_periodic_scheduler_init.ml index 6300f89db2..1bd13d5f6d 100644 --- a/ocaml/xapi/xapi_periodic_scheduler_init.ml +++ b/ocaml/xapi/xapi_periodic_scheduler_init.ml @@ -129,9 +129,10 @@ let register ~__context = ) ) ; let stunnel_period = !Stunnel_cache.max_idle /. 2. in - Xapi_periodic_scheduler.add_to_queue "Check stunnel cache expiry" - (Xapi_periodic_scheduler.Periodic stunnel_period) stunnel_period - Stunnel_cache.gc ; + Xapi_stdext_threads_scheduler.Scheduler.add_to_queue + "Check stunnel cache expiry" + (Xapi_stdext_threads_scheduler.Scheduler.Periodic stunnel_period) + stunnel_period Stunnel_cache.gc ; if master && Db.Pool.get_update_sync_enabled ~__context ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some plugins may not store the client-set metadata, and return a static value
when replying to the update. This would override the values that a client
used when the SR was created, or set afterwards, which is unexpected.
Now name_label and name_description fields returned by the plugins are ignored
on update.
Current set_name_label and set_name_description rely on the update mechanism to
work. Instead, add database call at the end of the methods to ensure both xapi
and the SR backend are synchronized, even when the latter fails to update the
values.
Tested on GFS2 tests (JR 4175192), as well as ring3 bvt + bst (209177), and storage validation tests (SR 209180)