Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CP-49147: Reduce size of the pool record (uefi_certificates) #6182

Draft
wants to merge 1 commit into
base: feature/perf
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml/idl/datamodel_common.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 785
let schema_minor_vsn = 786

(* Historical schema versions just in case this is useful later *)
let rio_schema_major_vsn = 5
Expand Down
19 changes: 18 additions & 1 deletion ocaml/idl/datamodel_pool.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,18 @@ let disable_repository_proxy =
~allowed_roles:(_R_POOL_OP ++ _R_CLIENT_CERT)
()

let get_uefi_certificates =
call ~name:"get_uefi_certificates"
~result:(String, "The UEFI certificates")
~lifecycle:
[
(Published, "22.16.0", "")
; (Changed, "24.38.0", "internal type changed to blob")
]
~doc:"Get the UEFI certificates for a pool"
~params:[(Ref _pool, "self", "The pool")]
~allowed_roles:_R_POOL_ADMIN ()

let set_uefi_certificates =
call ~name:"set_uefi_certificates"
~lifecycle:
Expand Down Expand Up @@ -1620,6 +1632,7 @@ let t =
; disable_client_certificate_auth
; configure_repository_proxy
; disable_repository_proxy
; get_uefi_certificates
; set_uefi_certificates
; set_custom_uefi_certificates
; set_https_only
Expand Down Expand Up @@ -2006,9 +2019,13 @@ let t =
, "22.16.0"
, "Became StaticRO to be editable through new method"
)
; ( Changed
, "24.38.0"
, "Field converted to internal-only and replaced with a digest"
)
]
~default_value:(Some (VString "")) "uefi_certificates"
"The UEFI certificates allowing Secure Boot"
~internal_only:true "The UEFI certificates allowing Secure Boot"
; field ~qualifier:StaticRO ~ty:String ~lifecycle:[]
~default_value:(Some (VString "")) "custom_uefi_certificates"
"Custom UEFI certificates allowing Secure Boot"
Expand Down
4 changes: 2 additions & 2 deletions ocaml/idl/json_backend/gen_json.ml
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,8 @@ module Version = struct
try Scanf.sscanf name "%d.%d.%d%s" of_chunks
with _ ->
failwith
(Printf.sprintf "Version schema changed, please change this code %s"
__LOC__
(Printf.sprintf "Version schema changed, please change this code %s: %s"
name __LOC__
)

let to_name_date (lst, str) =
Expand Down
2 changes: 1 addition & 1 deletion ocaml/idl/schematest.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let hash x = Digest.string x |> Digest.to_hex
(* BEWARE: if this changes, check that schema has been bumped accordingly in
ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)

let last_known_schema_hash = "18df8c33434e3df1982e11ec55d1f3f8"
let last_known_schema_hash = "b868d0553a0f37cede3bc454104d66e1"

let current_schema_hash : string =
let open Datamodel_types in
Expand Down
4 changes: 3 additions & 1 deletion ocaml/xapi-cli-server/records.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,9 @@ let pool_record rpc session_id pool =
)
()
; make_field ~name:"uefi-certificates" ~hidden:true
~get:(fun () -> (x ()).API.pool_uefi_certificates)
~get:(fun () ->
Client.Pool.get_uefi_certificates ~rpc ~session_id ~self:pool
)
~set:(fun value ->
Client.Pool.set_uefi_certificates ~rpc ~session_id ~self:pool ~value
)
Expand Down
3 changes: 2 additions & 1 deletion ocaml/xapi/helpers.ml
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,8 @@ let get_active_uefi_certificates ~__context ~self =
in
match (!Xapi_globs.allow_custom_uefi_certs, custom_uefi_certs) with
| false, _ | true, "" ->
Db.Pool.get_uefi_certificates ~__context ~self
let master = Db.Pool.get_master ~__context ~self in
Db.Host.get_uefi_certificates ~__context ~self:master
| true, _ ->
custom_uefi_certs

Expand Down
2 changes: 1 addition & 1 deletion ocaml/xapi/xapi_host.ml
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,7 @@ let write_uefi_certificates_to_disk ~__context ~host =
if Pool_role.is_master () then
Db.Pool.set_uefi_certificates ~__context
~self:(Helpers.get_pool ~__context)
~value:disk_uefi_certs_tar ;
~value:(Digest.string disk_uefi_certs_tar |> Digest.to_hex) ;
let pool_uefi_certs =
Db.Pool.get_custom_uefi_certificates ~__context
~self:(Helpers.get_pool ~__context)
Expand Down
5 changes: 5 additions & 0 deletions ocaml/xapi/xapi_pool.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3722,6 +3722,11 @@ let disable_repository_proxy ~__context ~self =
Db.Secret.destroy ~__context ~self:old_secret_ref
)

let get_uefi_certificates ~__context ~self =
(* cyclic dependency with Helpers, do it inline *)
let master = Db.Pool.get_master ~__context ~self in
Db.Host.get_uefi_certificates ~__context ~self:master

let set_uefi_certificates ~__context ~self:_ ~value:_ =
let msg =
"Setting UEFI certificates is deprecated, please use \
Expand Down
2 changes: 2 additions & 0 deletions ocaml/xapi/xapi_pool.mli
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ val configure_repository_proxy :

val disable_repository_proxy : __context:Context.t -> self:API.ref_pool -> unit

val get_uefi_certificates : __context:Context.t -> self:API.ref_pool -> string

val set_uefi_certificates :
__context:Context.t -> self:API.ref_pool -> value:string -> unit

Expand Down
Loading