diff options
| author | Rick Harris <rconradharris@gmail.com> | 2013-02-26 01:22:42 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2013-02-26 01:22:42 +0000 |
| commit | 0b23bdf77d573a30a437ebaf9c6ea734d5fec9bf (patch) | |
| tree | cdd045bec70b538dade4086db88ce5b763de19c0 | |
| parent | e62d0cb93a4ac788f208982d5d24ced4bc7c4c8f (diff) | |
| download | nova-0b23bdf77d573a30a437ebaf9c6ea734d5fec9bf.tar.gz nova-0b23bdf77d573a30a437ebaf9c6ea734d5fec9bf.tar.xz nova-0b23bdf77d573a30a437ebaf9c6ea734d5fec9bf.zip | |
Migration 148: Fix drop table dependency order
The downgrade of 148 was broken because instance_actions_events has a FK
dependency on instance_actions but was attempted to be deleted first,
which caused the sqlalchemy to complain.
The fix is to reorder the table deletes in the downgrade.
Additional cleanups:
* Remove unecessary exception handling which masked errors
Change-Id: Iaac77ba0e81071f6bb39e5cc3b599a4138eb3cd2
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py index 6adfb1dc1..b0fc98578 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py @@ -68,14 +68,8 @@ def upgrade(migrate_engine): mysql_charset='utf8', ) - try: - instance_actions.create() - instance_actions_events.create() - except Exception: - LOG.exception("Exception while creating table 'instance_actions' or " - "'instance_actions_events'") - meta.drop_all(tables=[instance_actions, instance_actions_events]) - raise + instance_actions.create() + instance_actions_events.create() Index('instance_uuid_idx', instance_actions.c.instance_uuid).create(migrate_engine) @@ -87,15 +81,9 @@ def downgrade(migrate_engine): meta = MetaData() meta.bind = migrate_engine - try: - instance_actions = Table('instance_actions', meta, autoload=True) - instance_actions.drop() - except Exception: - LOG.exception("Exception dropping table 'instance_actions'") + instance_actions_events = Table('instance_actions_events', meta, + autoload=True) + instance_actions_events.drop() - try: - instance_actions_events = Table('instance_actions_events', meta, - autoload=True) - instance_actions_events.drop() - except Exception: - LOG.exception("Exception dropping table 'instance_actions_events") + instance_actions = Table('instance_actions', meta, autoload=True) + instance_actions.drop() |