From a516e4eb6c2fd166840e0f9c5871930927517741 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Tue, 7 May 2024 16:00:09 +0100 Subject: [PATCH 1/3] CP-48969: Reduce amount of logspam created by iostat Do not output loglines that are part of the normal operation. Use debug for them, they are not usually logged, but can be enabled if need be by changing the loglevel Signed-off-by: Pau Ruiz Safont --- ocaml/xcp-rrdd/bin/rrdp-iostat/rrdp_iostat.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/xcp-rrdd/bin/rrdp-iostat/rrdp_iostat.ml b/ocaml/xcp-rrdd/bin/rrdp-iostat/rrdp_iostat.ml index 23d8831b9cf..c718a033d0f 100644 --- a/ocaml/xcp-rrdd/bin/rrdp-iostat/rrdp_iostat.ml +++ b/ocaml/xcp-rrdd/bin/rrdp-iostat/rrdp_iostat.ml @@ -124,7 +124,7 @@ let update_vdi_to_vm_map () = xs.Xs.read (Printf.sprintf "%s/sm-data/vdi-uuid" vbd) in let device = xs.Xs.read (Printf.sprintf "%s/dev" vbd) in - D.info "Found VDI %s at device %s in VM %s, device id %d" + D.debug "Found VDI %s at device %s in VM %s, device id %d" vdi device vm devid ; Some (vdi, (vm, device, devid)) with Xs_protocol.Enoent _ -> @@ -456,7 +456,7 @@ let exec_tap_ctl_list () : ((string * string) * int) list = | None -> () | Some reason -> - D.info "Updating VDI-to-VM map because %s" reason ; + D.debug "Updating VDI-to-VM map because %s" reason ; update_vdi_to_vm_map () ) ; previous_map := pid_and_minor_to_sr_and_vdi ; From 31a5aec0cf14fb245f7adae2f97f8c8b43f9e364 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Tue, 7 May 2024 16:18:24 +0100 Subject: [PATCH 2/3] opam: update dependencies from the code Signed-off-by: Pau Ruiz Safont --- xapi-idl.opam | 2 ++ xapi-idl.opam.template | 2 ++ xapi-xenopsd.opam | 1 + xapi-xenopsd.opam.template | 1 + 4 files changed, 6 insertions(+) diff --git a/xapi-idl.opam b/xapi-idl.opam index 9364d605142..d6e7a390671 100644 --- a/xapi-idl.opam +++ b/xapi-idl.opam @@ -17,7 +17,9 @@ depends: [ "astring" "cmdliner" "cohttp" + "cohttp-posix" "fd-send-recv" + "ipaddr" "logs" "lwt" {>= "5.0.0"} "message-switch-async" {with-test} diff --git a/xapi-idl.opam.template b/xapi-idl.opam.template index 26a26335277..6c879e68b97 100644 --- a/xapi-idl.opam.template +++ b/xapi-idl.opam.template @@ -15,7 +15,9 @@ depends: [ "astring" "cmdliner" "cohttp" + "cohttp-posix" "fd-send-recv" + "ipaddr" "logs" "lwt" {>= "5.0.0"} "message-switch-async" {with-test} diff --git a/xapi-xenopsd.opam b/xapi-xenopsd.opam index 944bf5d1b61..c5f5c34474c 100644 --- a/xapi-xenopsd.opam +++ b/xapi-xenopsd.opam @@ -40,6 +40,7 @@ depends: [ "xapi-stdext-threads" "xapi-stdext-unix" "xapi-tracing" + "xapi-tracing-export" "xenstore_transport" {with-test} "xmlm" "zstd" diff --git a/xapi-xenopsd.opam.template b/xapi-xenopsd.opam.template index 1aaf0524539..39b101a724e 100644 --- a/xapi-xenopsd.opam.template +++ b/xapi-xenopsd.opam.template @@ -38,6 +38,7 @@ depends: [ "xapi-stdext-threads" "xapi-stdext-unix" "xapi-tracing" + "xapi-tracing-export" "xenstore_transport" {with-test} "xmlm" "zstd" From b307724d7f9dea1bccc184b2f2dfe2fd2bdf4446 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Tue, 7 May 2024 16:18:56 +0100 Subject: [PATCH 3/3] idl: bump datamodel_lifecycle New version got released Signed-off-by: Pau Ruiz Safont --- ocaml/idl/datamodel_lifecycle.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml/idl/datamodel_lifecycle.ml b/ocaml/idl/datamodel_lifecycle.ml index 94870d262c7..5044adec27b 100644 --- a/ocaml/idl/datamodel_lifecycle.ml +++ b/ocaml/idl/datamodel_lifecycle.ml @@ -110,11 +110,11 @@ let prototyped_of_message = function | "Repository", "set_gpgkey_path" -> Some "22.12.0" | "PCI", "get_dom0_access_status" -> - Some "24.13.0-next" + Some "24.14.0" | "PCI", "enable_dom0_access" -> - Some "24.13.0-next" + Some "24.14.0" | "PCI", "disable_dom0_access" -> - Some "24.13.0-next" + Some "24.14.0" | "message", "destroy_many" -> Some "22.19.0" | "VTPM", "set_contents" ->