From 95693cb2a15d5360279f4566e4e965cb6451cef2 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Fri, 11 May 2012 00:21:00 +0000 Subject: 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 --- nova/db/sqlalchemy/api.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nova') 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, -- cgit