Merge lp:~dan-prince/nova/db_migrate_014_sqlite_fix into lp:~hudson-openstack/nova/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Devin Carlen | ||||
Approved revision: | 1006 | ||||
Merged at revision: | 1020 | ||||
Proposed branch: | lp:~dan-prince/nova/db_migrate_014_sqlite_fix | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
18 lines (+4/-2) 1 file modified
nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py (+4/-2) |
||||
To merge this branch: | bzr merge lp:~dan-prince/nova/db_migrate_014_sqlite_fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
termie (community) | Approve | ||
Review via email: mp+58402@code.launchpad.net |
Commit message
Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite.
Description of the change
Create a dictionary of instance_types before executing SQL updates in the instance_type_id migration (014). This should resolve a "cannot commit transaction - SQL statements in progress" error with some versions of sqlite. In this case an older version of Sqlite on SLES11 SP1.
While it is normally a bad idea to change database migrations after the fact this is a special case since it is just an implementation change. The functional database changes accomplished by this migration are the same.
lgtm