From a8c08baeb2ee6268ac61613a23cc86cf885a9d09 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Wed, 25 Jul 2012 20:43:17 +0000 Subject: Handle NULL deleted_at in migration 112. A NULL value in `instance.deleted_at` will cause the migration to break. In the absence of instance deleted_at timestamp, we should be conservative and skip cleanup. Fixes bug 1029129 Change-Id: Ieb978281bc55727fb7db02ddc8c3e0fd6c8814f0 --- .../migrate_repo/versions/112_update_deleted_instance_data.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py index 24f7f7164..e491e08fe 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py @@ -36,6 +36,8 @@ def upgrade(migrate_engine): table = Table(table_name, meta, autoload=True) for instance in instance_list: + if not instance['deleted_at']: + continue table.update( (and_(table.c.deleted == True, table.c.instance_uuid == instance['uuid'], -- cgit