Skip to content

CP-23026 add database schema version to software_version () #3113

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
jonludlam merged 1 commit into from
Jun 30, 2017
Merged

CP-23026 add database schema version to software_version () #3113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
CP-23026 add database schema version to software_version () 
Function assert_db_schema_matches relies on the database schema version
being available from Client.Host.get_software_version. This commit adds
the code that puts it there. It is backported from the master branch.

Signed-off-by: Christian Lindig <[email protected]>
  • Loading branch information
@lindig
lindig committed Jun 30, 2017
commit 6073194cc103543a193092214172ff8f083edb5a
1 change: 1 addition & 0 deletions ocaml/xapi/create_misc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ let make_software_version ~__context =
"xencenter_min", Xapi_globs.xencenter_min_verstring;
"xencenter_max", Xapi_globs.xencenter_max_verstring;
"network_backend", Network_interface.string_of_kind (Net.Bridge.get_kind dbg ());
Xapi_globs._db_schema, Printf.sprintf "%d.%d" Datamodel.schema_major_vsn Datamodel.schema_minor_vsn;
] @
(option_to_list "oem_manufacturer" info.oem_manufacturer) @
(option_to_list "oem_model" info.oem_model) @
Expand Down