Skip to content

xenopsd/xc: Print all information in Service_failed exceptions #4807

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 4, 2022
Merged

xenopsd/xc: Print all information in Service_failed exceptions #4807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11e422a
idl: update datamodel_lifecycle after tag
psafont Oct 4, 2022
6aae998
xenopsd/xc: Print all information in Service_failed exceptions
psafont Oct 4, 2022
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
6 changes: 3 additions & 3 deletions ocaml/idl/datamodel_lifecycle.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let prototyped_of_field = function
| "VTPM", "persistence_backend" ->
Some "22.26.0"
| "host", "https_only" ->
Some "22.26.0-next"
Some "22.27.0"
| "host", "last_software_update" ->
Copy link
Contributor

@lindig lindig Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want this as part of the PR?

Copy link
Member Author

@psafont psafont Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's not part of this PR it will need to go in independently because anybody that builds on top of master will get these changes

Copy link
Member

@robhoes robhoes Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is good to include these in whatever PR comes after the tag.

Some "22.20.0"
| _ ->
Expand All @@ -38,8 +38,8 @@ let prototyped_of_message = function
| "VTPM", "create" ->
Some "22.26.0"
| "host", "set_https_only" ->
Some "22.26.0-next"
Some "22.27.0"
| "pool", "set_https_only" ->
Some "22.26.0-next"
Some "22.27.0"
| _ ->
None
9 changes: 9 additions & 0 deletions ocaml/xenopsd/xc/service.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ let defer f g = Xapi_stdext_pervasives.Pervasiveext.finally g f

exception Service_failed of (string * string)

let () =
Printexc.register_printer (function
| Service_failed (service, reason) ->
Copy link
Contributor

@lindig lindig Oct 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This installs a printer for an existing exception.

Some
(Printf.sprintf "Service_failed(service=%s,reason=%s)" service reason)
| _ ->
None
)

type t = {
name: string
; domid: Xenctrl.domid
Expand Down