From: David Scott Date: Wed, 26 Jan 2011 17:39:05 +0000 (+0000) Subject: Remove the xapi_major from the database manifest because it shouldn't have been used... X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbc42f81f19b24062450ae6e7b527c0f4359ac61;p=xcp%2Fxen-api.git Remove the xapi_major from the database manifest because it shouldn't have been used: version checks should have considered the schema version instead. Signed-off-by: David Scott --- diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml index f5b76ae3..3ac3f279 100644 --- a/ocaml/database/db_cache_types.ml +++ b/ocaml/database/db_cache_types.ml @@ -30,7 +30,6 @@ type db_dump_manifest = { schema_major_vsn : int; schema_minor_vsn : int; - xapi_major_vsn : int; xapi_minor_vsn : int; generation_count : Generation.t } @@ -39,7 +38,6 @@ let gen_manifest gen_count = { schema_major_vsn = Datamodel.schema_major_vsn; schema_minor_vsn = Datamodel.schema_minor_vsn; - xapi_major_vsn = Xapi_globs.version_major; xapi_minor_vsn = Xapi_globs.version_minor; generation_count = gen_count } diff --git a/ocaml/database/db_cache_types.mli b/ocaml/database/db_cache_types.mli index f006c9a1..561d549e 100644 --- a/ocaml/database/db_cache_types.mli +++ b/ocaml/database/db_cache_types.mli @@ -25,7 +25,6 @@ type structured_op_t = AddSet | RemoveSet | AddMap | RemoveMap type db_dump_manifest = { schema_major_vsn : int; schema_minor_vsn : int; - xapi_major_vsn : int; xapi_minor_vsn : int; generation_count : Int64.t; } diff --git a/ocaml/database/db_xml.ml b/ocaml/database/db_xml.ml index 01c8f91b..58fde6f7 100644 --- a/ocaml/database/db_xml.ml +++ b/ocaml/database/db_xml.ml @@ -24,7 +24,6 @@ let make_tag n attrs : Xmlm.tag = (name n), List.map (fun (k, v) -> name k, v) a let _schema_major_vsn = "schema_major_vsn" let _schema_minor_vsn = "schema_minor_vsn" -let _xapi_major_vsn = "xapi_major_vsn" let _xapi_minor_vsn = "xapi_minor_vsn" let _generation_count = "generation_count" @@ -61,7 +60,6 @@ module To = struct Xmlm.output output (`El_start (make_tag "manifest" [])); int output _schema_major_vsn manifest.schema_major_vsn; int output _schema_minor_vsn manifest.schema_minor_vsn; - int output _xapi_major_vsn manifest.xapi_major_vsn; int output _xapi_minor_vsn manifest.xapi_minor_vsn; int64 output _generation_count manifest.generation_count; Xmlm.output output `El_end @@ -132,7 +130,6 @@ module From = struct let manifest = { schema_major_vsn = int_of_string (List.assoc _schema_major_vsn manifest); schema_minor_vsn = int_of_string (List.assoc _schema_minor_vsn manifest); - xapi_major_vsn = int_of_string (List.assoc _xapi_major_vsn manifest); xapi_minor_vsn = int_of_string (List.assoc _xapi_minor_vsn manifest); generation_count = Int64.of_string (List.assoc _generation_count manifest) } in diff --git a/ocaml/xapi/pool_db_backup.ml b/ocaml/xapi/pool_db_backup.ml index 22d6e0c8..612f0086 100644 --- a/ocaml/xapi/pool_db_backup.ml +++ b/ocaml/xapi/pool_db_backup.ml @@ -29,7 +29,7 @@ let octet_stream = "Content-Type: application/octet-stream" (* CA-18377: The smallest database that is compatible with the Miami database schema. *) let minimally_compliant_miami_database = - "
" + "
" (** Write the database dump out to a file/socket *) let write_database (s: Unix.file_descr) ~__context = @@ -44,8 +44,8 @@ let write_database (s: Unix.file_descr) ~__context = (** Make sure the backup database version is compatible *) let version_check manifest = - if manifest.Db_cache_types.xapi_major_vsn <> Xapi_globs.version_major || - manifest.Db_cache_types.xapi_minor_vsn <> Xapi_globs.version_minor then + if manifest.Db_cache_types.schema_major_vsn <> Datamodel.schema_major_vsn || + manifest.Db_cache_types.schema_minor_vsn <> Datamodel.schema_minor_vsn then begin error "Pool backup file was created with incompatable product version"; raise (Api_errors.Server_error(Api_errors.restore_incompatible_version, []))