xapi-project / xen-api / 12258746962

78%

master: 80%

push

github

Update feature/perf from master (#6167)

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 <a class=hub.com/xapi-project/xen-api/commit/81146d223d3d5cd449105ecef713cfd57e2c1853">81146d223
```

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: 59da2e0fdb d8baca7840
Author: Edwin Török <edwin.torok@cloud.com>
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 <edwin.torok@cloud.com>

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"

-<<<<<<< 59da2e0fdb (CA-388564: move qemu-dm to vm.slice (#6150))
   let originator = "originator"

-  let traceparent = "traceparent"
-
-||||||| 77dd47498e
-  let traceparent = "traceparent"
-
-=======
->>>>>>> d8baca7840 (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
-<<<<<<< 59da2e0fdb (CA-388564: move qemu-dm to vm.slice (#6150))

   let with_originator_of req f =
     Option.it... (continued)

4 of 4 new or added lines in 2 files covered. (100.0%)

3462 of 4423 relevant lines covered (78.27%)

0.78 hits per line