Merge 26.1-lcm into feature/26.1-lcm/trusted-certs (#7012)

No conflicts.
One extra commit daef7c7 to bump up
schema_minor_vsn.

Author: minglumlu

ocaml/idl/datamodel.ml

@@ -11009,7 +11009,7 @@ let http_actions =
   ; ( "get_vm_rrds"
     , ( Get
       , "/vm_rrds"
-      , true
+      , false
       , [String_query_arg "uuid"; Bool_query_arg "json"]
       , _R_READ_ONLY
       , []
@@ -11026,7 +11026,7 @@ let http_actions =
     )
     (* For XC < 8460 compatibility, remove when out of support *)
   ; ( "get_host_rrds"
-    , (Get, "/host_rrds", true, [Bool_query_arg "json"], _R_READ_ONLY, [])
+    , (Get, "/host_rrds", false, [Bool_query_arg "json"], _R_READ_ONLY, [])
     )
   ; ( Constants.get_sr_rrd
     , ( Get

ocaml/idl/datamodel_common.ml

@@ -10,7 +10,7 @@ open Datamodel_roles
               to leave a gap for potential hotfixes needing to increment the schema version.*)
 let schema_major_vsn = 5
 
-let schema_minor_vsn = 793
+let schema_minor_vsn = 794
 
 (* Historical schema versions just in case this is useful later *)
 let rio_schema_major_vsn = 5

ocaml/idl/ocaml_backend/dune

@@ -4,8 +4,6 @@
   (libraries
     astring
     cmdliner
-    fmt
-    ptime.clock
     uuidm
     xapi-consts
     xapi-datamodel

ocaml/idl/ocaml_backend/gen_rbac.ml

@@ -34,13 +34,10 @@ let internal_role_local_root = "_local_root_"
 
 (* the output of this function is used as input by the automatic tests *)
 let writer_csv static_permissions_roles =
-  let now =
-    let now = Ptime_clock.now () in
-    let str = Fmt.str "%a" Ptime.(pp_rfc3339 ~frac_s:3 ~tz_offset_s:0 ()) now in
-    (* remove separators between Year, Month, and Day; to keep old logging format *)
-    Astring.String.filter (function '-' -> false | _ -> true) str
-  in
-  Printf.sprintf "%s,PERMISSION/ROLE,%s\n" now
+  Printf.sprintf "%s,PERMISSION/ROLE,%s\n"
+    (let t = Debug.gettimestring () in
+     String.sub t 0 (String.length t - 1)
+    )
     (* role titles are ordered by roles in roles_all *)
     (List.fold_left (fun rr r -> rr ^ r ^ ",") "" Datamodel_roles.roles_all)
   ^ List.fold_left

ocaml/libs/log/debug.ml

@@ -74,8 +74,13 @@ let tasks : task ThreadLocalTable.t = ThreadLocalTable.make ()
 let names : string ThreadLocalTable.t = ThreadLocalTable.make ()
 
 let gettimestring () =
-  let now = Ptime_clock.now () in
-  Fmt.str "%a|" Ptime.(pp_rfc3339 ~frac_s:3 ~tz_offset_s:0 ()) now
+  let time = Unix.gettimeofday () in
+  let tm = Unix.gmtime time in
+  let msec = time -. floor time in
+  Printf.sprintf "%d%.2d%.2dT%.2d:%.2d:%.2d.%.3dZ|" (1900 + tm.Unix.tm_year)
+    (tm.Unix.tm_mon + 1) tm.Unix.tm_mday tm.Unix.tm_hour tm.Unix.tm_min
+    tm.Unix.tm_sec
+    (int_of_float (1000.0 *. msec))
 
 (** [escape str] efficiently escapes non-printable characters and in addition
     the backslash character. The function is efficient in the sense that it will

ocaml/libs/log/debug.mli

@@ -31,6 +31,9 @@ val with_thread_named : string -> ('a -> 'b) -> 'a -> 'b
 
 module type BRAND = sig val name : string end
 
+val gettimestring : unit -> string
+(** The current time of day in a format suitable for logging *)
+
 val set_facility : Syslog.facility -> unit
 (** Set the syslog facility that will be used by this program. *)
 

ocaml/libs/log/dune

@@ -9,8 +9,6 @@
    fmt
    mtime
    logs
-   ptime
-   ptime.clock
    threads.posix
    xapi-backtrace
    unix

ocaml/quicktest/qt.ml

@@ -180,20 +180,25 @@ module VDI = struct
 
   let test_vdi_name_description = "VDI for storage quicktest"
 
-  let make rpc session_id ?(virtual_size = 4194304L) sR =
+  let make rpc session_id ?(virtual_size = Int64.(mul (mul 4L 1024L) 1024L))
+      ?backing_format sR =
+    let sm_config =
+      match backing_format with Some x -> [("image-format", x)] | None -> []
+    in
     Client.Client.VDI.create ~sR ~session_id ~rpc
       ~name_label:test_vdi_name_label
       ~name_description:test_vdi_name_description ~_type:`user ~sharable:false
       ~read_only:false ~virtual_size ~xenstore_data:[] ~other_config:[] ~tags:[]
-      ~sm_config:[]
+      ~sm_config
 
   let with_destroyed rpc session_id self f =
     Xapi_stdext_pervasives.Pervasiveext.finally f (fun () ->
         Client.Client.VDI.destroy ~rpc ~session_id ~self
     )
 
-  let with_new rpc session_id ?(virtual_size = 4194304L) sr f =
-    let self = make rpc session_id ~virtual_size sr in
+  let with_new rpc session_id ?(virtual_size = Int64.(mul (mul 4L 1024L) 1024L))
+      ?backing_format sr f =
+    let self = make rpc session_id ~virtual_size ?backing_format sr in
     with_destroyed rpc session_id self (fun () -> f self)
 
   let with_any rpc session_id sr_info f =

ocaml/quicktest/qt.mli

@@ -73,6 +73,7 @@ module VDI : sig
        rpc
     -> API.ref_session
     -> ?virtual_size:int64
+    -> ?backing_format:string
     -> API.ref_SR
     -> (API.ref_VDI -> 'a)
     -> 'a

ocaml/quicktest/qt_filter.mli

@@ -68,6 +68,9 @@ module SR : sig
   val not_type : string -> srs -> srs
   (** Filters out SRs of the given type *)
 
+  val is_smapiv1 : Qt.sr_info -> bool
+  (** Whether this is a v1 (true) or v3+ (false) SR *)
+
   val smapiv1 : srs -> srs
   (** Selects SMAPIv1 SRs *)