From: David Scott Date: Wed, 26 Jan 2011 17:39:05 +0000 (+0000) Subject: Remove the pool_token from the database manifest since it doesn't make sense to prese... X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c70e519e9b128e4a297f309c608be9a4faa23f78;p=xcp%2Fxen-api.git Remove the pool_token from the database manifest since it doesn't make sense to preserve the pool secret if all other hosts are being deleted anyway (on database restore) Signed-off-by: David Scott --- diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml index fb20fe27..10082c3f 100644 --- a/ocaml/database/db_cache_types.ml +++ b/ocaml/database/db_cache_types.ml @@ -28,7 +28,6 @@ let string_of_structured_op op = match op with type db_dump_manifest = { - pool_token : string; schema_major_vsn : int; schema_minor_vsn : int; product_version : string; @@ -41,7 +40,6 @@ type db_dump_manifest = let gen_manifest gen_count = { - pool_token = Unixext.string_of_file Xapi_globs.pool_secret_path; schema_major_vsn = Datamodel.schema_major_vsn; schema_minor_vsn = Datamodel.schema_minor_vsn; product_version = Version.product_version; diff --git a/ocaml/database/db_cache_types.mli b/ocaml/database/db_cache_types.mli index cd0af06f..4ad75a0d 100644 --- a/ocaml/database/db_cache_types.mli +++ b/ocaml/database/db_cache_types.mli @@ -23,7 +23,6 @@ type where_record = { } type structured_op_t = AddSet | RemoveSet | AddMap | RemoveMap type db_dump_manifest = { - pool_token : string; schema_major_vsn : int; schema_minor_vsn : int; product_version : string; diff --git a/ocaml/database/db_xml.ml b/ocaml/database/db_xml.ml index 68f58ede..ed57437d 100644 --- a/ocaml/database/db_xml.ml +++ b/ocaml/database/db_xml.ml @@ -22,7 +22,6 @@ exception Unmarshall_error of string let name x = ("", x) (* no namespace *) let make_tag n attrs : Xmlm.tag = (name n), List.map (fun (k, v) -> name k, v) attrs -let _pool_token = "pool_token" let _schema_major_vsn = "schema_major_vsn" let _schema_minor_vsn = "schema_minor_vsn" let _product_version = "product_version" @@ -63,7 +62,6 @@ module To = struct (* Write out a manifest *) let manifest (output: Xmlm.output) (manifest: db_dump_manifest) : unit = Xmlm.output output (`El_start (make_tag "manifest" [])); - string output _pool_token manifest.pool_token; int output _schema_major_vsn manifest.schema_major_vsn; int output _schema_minor_vsn manifest.schema_minor_vsn; string output _product_version manifest.product_version; @@ -138,7 +136,6 @@ module From = struct let (cache, _, manifest) = f (create_empty_cache (), create_empty_table (), []) in (* Manifest is actually a record *) let manifest = { - pool_token = List.assoc _pool_token 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); product_version = List.assoc _product_version manifest; diff --git a/ocaml/xapi/pool_db_backup.ml b/ocaml/xapi/pool_db_backup.ml index 8ad4d76d..07520751 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 = @@ -155,10 +155,8 @@ let restore_from_xml __context dry_run (xml_filename: string) = then raise (Api_errors.Server_error(Api_errors.restore_target_mgmt_if_not_in_backup, !ifs_in_backup)); (* write manifest and unmarshalled db directly to db_temporary_restore_path, so its ready for us on restart *) - if not(dry_run) then begin - Unixext.write_string_to_file Xapi_globs.pool_secret_path manifest.Db_cache_types.pool_token; - Db_xml.To.file Xapi_globs.db_temporary_restore_path (manifest, unmarshalled_db) - end + if not(dry_run) + then Db_xml.To.file Xapi_globs.db_temporary_restore_path (manifest, unmarshalled_db) (** Called when a CLI user downloads a backup of the database *)