Remove the pool_token from the database manifest since it doesn't make sense to prese...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml
index fb20fe27087eb6206dcf9466c2a092cb581984a8..10082c3f3d997f25521226acc856da0934d72a9d 100644 (file)
--- 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 cd0af06f9d897d12de37dba166fe966e6d99746f..4ad75a0d8736ab6dfd4ee29fe9b2e26a5bd7cb21 100644 (file)
--- 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 68f58ede5740e869715700688e4a8a8e8f6f8043..ed57437d9ad46fb123eb8debba004e21c93f1a5b 100644 (file)
--- 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 8ad4d76dc33e6cf191dcb396bc7bffb64d1ebe10..0752075129fc4b78922dc478d23effb844d0072d 100644 (file)
--- 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 =
-       "<database><manifest><pair key=\"pool_token\" value=\"0495123c-aea2-be65-5885-c82ef39c630e/b56675f7-9f11-6b89-aebe-a82396a3bf0f/0141aea4-2858-4414-fbb7-a25dc95daa58\"/><pair key=\"schema_major_vsn\" value=\"5\"/><pair key=\"schema_minor_vsn\" value=\"35\"/><pair key=\"product_version\" value=\"4.1.0\"/><pair key=\"product_brand\" value=\"XenServer\"/><pair key=\"build_number\" value=\"7843c\"/><pair key=\"xapi_major_vsn\" value=\"1\"/><pair key=\"xapi_minor_vsn\" value=\"1\"/><pair key=\"generation_count\" value=\"103\"/></manifest><table name=\"SR\" /><table name=\"pool\" /><table name=\"VBD_metrics\"/><table name=\"console\" /><table name=\"host\" /><table name=\"VIF_metrics\"/><table name=\"user\" /><table name=\"PBD\" /><table name=\"pool_patch\" /><table name=\"host_metrics\" /><table name=\"VLAN\" /><table name=\"Bond\" /><table name=\"VTPM\" /><table name=\"event\"/><table name=\"VBD\" /><table name=\"VM_guest_metrics\" /><table name=\"VDI\" /><table name=\"VM_metrics\"/><table name=\"task\"/><table name=\"VM\" /><table name=\"crashdump\"/><table name=\"network\" /><table name=\"PIF\" /><table name=\"host_patch\"/><table name=\"host_crashdump\"/><table name=\"SM\" /><table name=\"host_cpu\" /><table name=\"VIF\" /><table name=\"session\" /><table name=\"PIF_metrics\" /></database>"
+       "<database><manifest><pair key=\"schema_major_vsn\" value=\"5\"/><pair key=\"schema_minor_vsn\" value=\"35\"/><pair key=\"product_version\" value=\"4.1.0\"/><pair key=\"product_brand\" value=\"XenServer\"/><pair key=\"build_number\" value=\"7843c\"/><pair key=\"xapi_major_vsn\" value=\"1\"/><pair key=\"xapi_minor_vsn\" value=\"1\"/><pair key=\"generation_count\" value=\"103\"/></manifest><table name=\"SR\" /><table name=\"pool\" /><table name=\"VBD_metrics\"/><table name=\"console\" /><table name=\"host\" /><table name=\"VIF_metrics\"/><table name=\"user\" /><table name=\"PBD\" /><table name=\"pool_patch\" /><table name=\"host_metrics\" /><table name=\"VLAN\" /><table name=\"Bond\" /><table name=\"VTPM\" /><table name=\"event\"/><table name=\"VBD\" /><table name=\"VM_guest_metrics\" /><table name=\"VDI\" /><table name=\"VM_metrics\"/><table name=\"task\"/><table name=\"VM\" /><table name=\"crashdump\"/><table name=\"network\" /><table name=\"PIF\" /><table name=\"host_patch\"/><table name=\"host_crashdump\"/><table name=\"SM\" /><table name=\"host_cpu\" /><table name=\"VIF\" /><table name=\"session\" /><table name=\"PIF_metrics\" /></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 *)