Merge branch 'master' into feature/config-ntp-timezone-maxcstate

Author: changlei-li

.git-blame-ignore-revs

@@ -33,6 +33,7 @@ b12cf444edea15da6274975e1b2ca6a7fce2a090
 364c27f5d18ab9dd31825e67a93efabecad06823
 d8b4de9076531dd13bdffa20cc10c72290a52356
 bdf06bca7534fbc0c4fc3cee3408a51a22615226
+eefc649e17086fbc200e4da114ea673825e79864
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

dune-project

@@ -586,14 +586,25 @@
   (depends
     qcow-stream
     cmdliner
+    yojson
   )
 )
 
 (package
  (name varstored-guard))
 
 (package
- (name uuid))
+ (name uuid)
+ (synopsis "Library used by xapi to generate database UUIDs")
+ (description
+  "This library allows xapi to use UUIDs with phantom types to avoid mixing UUIDs from different classes of objects. It's based on `uuidm`.")
+ (depends
+   (alcotest :with-test)
+   (fmt :with-test)
+   ptime
+   uuidm
+ )
+)
 
 (package
  (name stunnel)

ocaml/idl/datamodel_host.ml

@@ -1220,6 +1220,41 @@ let host_ntp_mode =
       ]
     )
 
+let host_numa_affinity_policy =
+  Enum
+    ( "host_numa_affinity_policy"
+    , [
+        ("any", "VMs are spread across all available NUMA nodes")
+      ; ( "best_effort"
+        , "VMs are placed on the smallest number of NUMA nodes that they fit \
+           using soft-pinning, but the policy doesn't guarantee a balanced \
+           placement, falling back to the 'any' policy."
+        )
+      ; ( "default_policy"
+        , "Use the NUMA affinity policy that is the default for the current \
+           version"
+        )
+      ]
+    )
+
+let latest_synced_updates_applied_state =
+  Enum
+    ( "latest_synced_updates_applied_state"
+    , [
+        ( "yes"
+        , "The host is up to date with the latest updates synced from remote \
+           CDN"
+        )
+      ; ( "no"
+        , "The host is outdated with the latest updates synced from remote CDN"
+        )
+      ; ( "unknown"
+        , "If the host is up to date with the latest updates synced from \
+           remote CDN is unknown"
+        )
+      ]
+    )
+
 let create_params =
   [
     {
@@ -1424,7 +1459,7 @@ let create_params =
         "The maximum C-state that the host is allowed to enter, \"\" means \
          unlimited; \"N\" means limit to CN; \"N,M\" means limit to CN with \
          max sub cstate M."
-    ; param_release= numbered_release "25.38.0-next"
+    ; param_release= numbered_release "25.39.0-next"
     ; param_default= Some (VString "")
     }
   ; {
@@ -1433,25 +1468,62 @@ let create_params =
     ; param_doc=
         "Indicates NTP servers are assigned by DHCP, or configured by user, or \
          the factory servers, or NTP is disabled"
-    ; param_release= numbered_release "25.38.0-next"
+    ; param_release= numbered_release "25.39.0-next"
     ; param_default= Some (VEnum "Factory")
     }
   ; {
       param_type= Set String
     ; param_name= "ntp_custom_servers"
     ; param_doc=
         "Custom NTP servers configured by users, used in Custom NTP mode"
-    ; param_release= numbered_release "25.38.0-next"
+    ; param_release= numbered_release "25.39.0-next"
     ; param_default= Some (VSet [])
     }
   ; {
       param_type= String
     ; param_name= "timezone"
     ; param_doc=
         "The time zone identifier as defined in the IANA Time Zone Database"
-    ; param_release= numbered_release "25.38.0-next"
+    ; param_release= numbered_release "25.39.0-next"
     ; param_default= Some (VString "UTC")
     }
+  ; {
+      param_type= host_numa_affinity_policy
+    ; param_name= "numa_affinity_policy"
+    ; param_doc= "NUMA-aware VM memory and vCPU placement policy"
+    ; param_release= numbered_release "25.39.0-next"
+    ; param_default= Some (VEnum "default_policy")
+    }
+  ; {
+      param_type= latest_synced_updates_applied_state
+    ; param_name= "latest_synced_updates_applied"
+    ; param_doc=
+        "Default as 'unknown', 'yes' if the host is up to date with updates \
+         synced from remote CDN, otherwise 'no'"
+    ; param_release= numbered_release "25.39.0-next"
+    ; param_default= Some (VSet [])
+    }
+  ; {
+      param_type= Set update_guidances
+    ; param_name= "pending_guidances_full"
+    ; param_doc=
+        "The set of pending full guidances after applying updates, which a \
+         user should follow to make some updates, e.g. specific hardware \
+         drivers or CPU features, fully effective, but the 'average user' \
+         doesn't need to"
+    ; param_release= numbered_release "25.39.0-next"
+    ; param_default= Some (VSet [])
+    }
+  ; {
+      param_type= Set update_guidances
+    ; param_name= "pending_guidances_recommended"
+    ; param_doc=
+        "The set of pending recommended guidances after applying updates, \
+         which most users should follow to make the updates effective, but if \
+         not followed, will not cause a failure"
+    ; param_release= numbered_release "25.39.0-next"
+    ; param_default= Some (VSet [])
+    }
   ]
 
 let create =
@@ -2357,23 +2429,6 @@ let cleanup_pool_secret =
       ]
     ~allowed_roles:_R_LOCAL_ROOT_ONLY ~hide_from_docs:true ()
 
-let host_numa_affinity_policy =
-  Enum
-    ( "host_numa_affinity_policy"
-    , [
-        ("any", "VMs are spread across all available NUMA nodes")
-      ; ( "best_effort"
-        , "VMs are placed on the smallest number of NUMA nodes that they fit \
-           using soft-pinning, but the policy doesn't guarantee a balanced \
-           placement, falling back to the 'any' policy."
-        )
-      ; ( "default_policy"
-        , "Use the NUMA affinity policy that is the default for the current \
-           version"
-        )
-      ]
-    )
-
 let set_numa_affinity_policy =
   call ~name:"set_numa_affinity_policy" ~lifecycle:[]
     ~doc:"Set VM placement NUMA affinity policy"
@@ -2581,24 +2636,6 @@ let update_firewalld_service_status =
        status."
     ~allowed_roles:_R_POOL_OP ()
 
-let latest_synced_updates_applied_state =
-  Enum
-    ( "latest_synced_updates_applied_state"
-    , [
-        ( "yes"
-        , "The host is up to date with the latest updates synced from remote \
-           CDN"
-        )
-      ; ( "no"
-        , "The host is outdated with the latest updates synced from remote CDN"
-        )
-      ; ( "unknown"
-        , "If the host is up to date with the latest updates synced from \
-           remote CDN is unknown"
-        )
-      ]
-    )
-
 let get_tracked_user_agents =
   call ~name:"get_tracked_user_agents" ~lifecycle:[]
     ~doc:

ocaml/idl/dune

@@ -64,9 +64,9 @@
 )
 
 (tests
-  (names schematest test_datetimes)
+  (names schematest test_datetimes test_host)
   (modes exe)
-  (modules schematest test_datetimes)
+  (modules schematest test_datetimes test_host)
   (libraries
     astring
     rpclib.core

ocaml/idl/test_host.ml

@@ -0,0 +1,31 @@
+module DT = Datamodel_types
+module FieldSet = Astring.String.Set
+
+let recent_field (f : DT.field) = f.lifecycle.transitions = []
+
+let rec field_full_names = function
+  | DT.Field f ->
+      if recent_field f then
+        f.full_name |> String.concat "_" |> Seq.return
+      else
+        Seq.empty
+  | DT.Namespace (_, xs) ->
+      xs |> List.to_seq |> Seq.concat_map field_full_names
+
+let () =
+  let create_params =
+    Datamodel_host.create_params
+    |> List.map (fun p -> p.DT.param_name)
+    |> FieldSet.of_list
+  and fields =
+    Datamodel_host.t.contents
+    |> List.to_seq
+    |> Seq.concat_map field_full_names
+    |> FieldSet.of_seq
+  in
+  let missing_in_create_params = FieldSet.diff fields create_params in
+  if not (FieldSet.is_empty missing_in_create_params) then (
+    Format.eprintf "Missing fields in create_params: %a@." FieldSet.dump
+      missing_in_create_params ;
+    exit 1
+  )

ocaml/idl/test_host.mli

@@ -47,20 +47,18 @@ val setup : unit -> unit
 
 (** {1 Static property tests} *)
 
-val as_readable : (([< readable] as 'a), 'b) make -> ([> readable], 'b) make
+val as_readable : ([< readable], 'b) make -> ([> readable], 'b) make
 (** [as_readable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 val as_writable : ([< writable], 'b) make -> ([> writable], 'b) make
 (** [as_writable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 (** {1 Runtime property tests}  *)
 
-val as_readable_opt :
-  (([< rw] as 'a), 'b) make -> ([> readable], 'b) make option
+val as_readable_opt : ([< rw], 'b) make -> ([> readable], 'b) make option
 (** [as_readable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
-val as_writable_opt :
-  (([< rw] as 'a), 'b) make -> ([> writable], 'b) make option
+val as_writable_opt : ([< rw], 'b) make -> ([> writable], 'b) make option
 (** [as_writable_opt t] returns [Some t] when [t] is readable, and [None] otherwise. *)
 
 val as_spipe_opt : ('a, [< kind]) make -> ('a, [> espipe]) make option

ocaml/libs/xapi-stdext/lib/xapi-fdcaps/operations.mli

@@ -212,6 +212,7 @@ let reset_state () =
           ) ;
         None
   in
+  Inventory.reread_inventory () ;
   config := Network_config.read_management_conf reset_order
 
 let set_gateway_interface _dbg name =

ocaml/networkd/bin/network_server.ml

@@ -28,19 +28,16 @@ let comment doc ?(indent = 0) s =
   let buf = Buffer.create 16 in
   let formatter = Format.formatter_of_buffer buf in
   let open Format in
-  let out, flush, newline, spaces =
-    let funcs = Format.pp_get_formatter_out_functions formatter () in
-    (funcs.out_string, funcs.out_flush, funcs.out_newline, funcs.out_spaces)
-  in
-
+  let funcs = Format.pp_get_formatter_out_functions formatter () in
+  let original_out_newline = funcs.out_newline in
   let funcs =
     {
-      out_string= out
-    ; out_flush= flush
-    ; out_newline=
-        (fun () -> out (Printf.sprintf "\n%s * " indent_str) 0 (indent + 4))
-    ; out_spaces= spaces
-    ; out_indent= spaces
+      funcs with
+      out_newline=
+        (fun () ->
+          funcs.out_string (Printf.sprintf "\n%s * " indent_str) 0 (indent + 4)
+        )
+    ; out_indent= funcs.out_spaces
     }
   in
   Format.pp_set_formatter_out_functions formatter funcs ;
@@ -61,7 +58,7 @@ let comment doc ?(indent = 0) s =
   Format.fprintf formatter "%!" ;
 
   Format.pp_set_formatter_out_functions formatter
-    {funcs with out_newline= newline} ;
+    {funcs with out_newline= original_out_newline} ;
 
   let result = Buffer.contents buf in
   let n = String.length result in

ocaml/sdk-gen/c/helper.ml

@@ -185,7 +185,9 @@ let make_host ~__context ?(uuid = make_uuid ()) ?(name_label = "host")
       ~console_idle_timeout ~ssh_auto_mode ~secure_boot
       ~software_version:(Xapi_globs.software_version ())
       ~https_only ~max_cstate:"" ~ntp_mode:`Factory ~ntp_custom_servers:[]
-      ~timezone:"UTC"
+      ~timezone:"UTC" ~numa_affinity_policy:`default_policy
+      ~latest_synced_updates_applied:`unknown ~pending_guidances_full:[]
+      ~pending_guidances_recommended:[]
   in
   Db.Host.set_cpu_info ~__context ~self:host ~value:default_cpu_info ;
   host