diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2012-05-11 00:21:00 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2012-05-11 00:21:00 +0000 |
| commit | 95693cb2a15d5360279f4566e4e965cb6451cef2 (patch) | |
| tree | a8352ae3f6272bf0aac99ecc803bf4d89d98eecd /nova | |
| parent | 584917cce51d9100abf4e5160c6cf5fa7055f618 (diff) | |
| download | nova-95693cb2a15d5360279f4566e4e965cb6451cef2.tar.gz nova-95693cb2a15d5360279f4566e4e965cb6451cef2.tar.xz nova-95693cb2a15d5360279f4566e4e965cb6451cef2.zip | |
Destroy system metadata when destroying instance
instance system_metadata was not being marked as deleted when an
instance is marked as deleted.
Fixes bug 997849
Change-Id: I876b402ca33f4574bb426615f6c467ded6908fc2
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 46e080578..78e08f43e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1333,6 +1333,11 @@ def instance_destroy(context, instance_id): update({'deleted': True, 'deleted_at': utils.utcnow(), 'updated_at': literal_column('updated_at')}) + session.query(models.InstanceSystemMetadata).\ + filter_by(instance_uuid=instance_ref['uuid']).\ + update({'deleted': True, + 'deleted_at': utils.utcnow(), + 'updated_at': literal_column('updated_at')}) session.query(models.BlockDeviceMapping).\ filter_by(instance_uuid=instance_ref['uuid']).\ update({'deleted': True, |