x/gantt
Code Issues Proposed changes

This patch stops metadata from being deleted when an instance is deleted.

Browse Source 
This patch makes it so that instance metadata, system metadata, and block
device mappings are no longer set to deleted when an instance is deleted.
It doesn't make sense to delete them just because the instance they describe
has been deleted.

This patch DOES NOT MIGRATE currently deleted metadata or block
device mappings for currently deleted instances, that means that usage
notifications for deleted instances that were deleted before this patch will
show image_meta as empty.

Fixes bug 1021830

Change-Id: I33ee402b859834e09535c7925957bee0a1d91207
This commit is contained in:
Alex Meade
2012-07-06 13:23:55 -04:00
parent 41288a212d
commit 6dd41cb65c
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/notifications.py
View File

@@ -214,13 +214,8 @@ def usage_from_instance(context, instance_ref, network_info,
if system_metadata is None:
try:
if instance_ref.get('deleted'):
with utils.temporary_mutation(context, read_deleted='yes'):
system_metadata = db.instance_system_metadata_get(
context, instance_ref['uuid'])
else:
system_metadata = db.instance_system_metadata_get(
context, instance_ref['uuid'])
system_metadata = db.instance_system_metadata_get(
context, instance_ref['uuid'])
except exception.NotFound:
system_metadata = {}