From 4cdca1605ecb9563eccc7f9f8fb2b37fe09a2111 Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 26 Jan 2011 17:39:05 +0000 Subject: [PATCH] Remove the pool_conf from the database manifest because it wasn't used. Signed-off-by: David Scott --- ocaml/database/db_cache_types.ml | 2 -- ocaml/database/db_cache_types.mli | 1 - ocaml/database/db_xml.ml | 3 --- ocaml/xapi/pool_db_backup.ml | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml index 0257647c..fb20fe27 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_conf : string; pool_token : string; schema_major_vsn : int; schema_minor_vsn : int; @@ -42,7 +41,6 @@ type db_dump_manifest = let gen_manifest gen_count = { - pool_conf = Unixext.string_of_file Xapi_globs.pool_config_file; 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; diff --git a/ocaml/database/db_cache_types.mli b/ocaml/database/db_cache_types.mli index 2a7d797a..cd0af06f 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_conf : string; pool_token : string; schema_major_vsn : int; schema_minor_vsn : int; diff --git a/ocaml/database/db_xml.ml b/ocaml/database/db_xml.ml index 6ddc62d7..68f58ede 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_conf = "pool_conf" let _pool_token = "pool_token" let _schema_major_vsn = "schema_major_vsn" let _schema_minor_vsn = "schema_minor_vsn" @@ -64,7 +63,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_conf manifest.pool_conf; 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; @@ -140,7 +138,6 @@ module From = struct let (cache, _, manifest) = f (create_empty_cache (), create_empty_table (), []) in (* Manifest is actually a record *) let manifest = { - pool_conf = List.assoc _pool_conf 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); diff --git a/ocaml/xapi/pool_db_backup.ml b/ocaml/xapi/pool_db_backup.ml index 7a566754..8ad4d76d 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 = -- 2.39.5