Merge commit 'a5ba6bbf32a3e62b30715ad6c697282291a62b3c'

xapi-project · Aug 3, 2012 · d0d5ccd · d0d5ccd
2 parents bf7b360 + a5ba6bb
commit d0d5ccd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ocaml/xapi/xapi_vdi_helpers.ml b/ocaml/xapi/xapi_vdi_helpers.ml
@@ -157,8 +157,12 @@ let database_ref_of_vdi ~__context ~vdi =
 		let db_ref = Db_ref.in_memory (ref (ref db)) in
 		Redo_log_usage.read_from_redo_log log Xapi_globs.foreign_metadata_db db_ref;
 		Redo_log.delete log;
+		(* Upgrade database to the local schema. *)
 		(* Reindex database to make sure is_valid_ref works. *)
-		Db_ref.update_database db_ref (Database.reindex ++ (Db_backend.blow_away_non_persistent_fields (Datamodel_schema.of_datamodel ())));
+		Db_ref.update_database db_ref
+			(Db_upgrade.generic_database_upgrade
+				++ Database.reindex
+				++ (Db_backend.blow_away_non_persistent_fields (Datamodel_schema.of_datamodel ())));
 		db_ref
 	in
 	Mutex.execute database_open_mutex