diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-29 21:31:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-29 21:31:56 +0000 |
| commit | 019d953ef5b4bed7c53401375bfd7aa890fc0c1d (patch) | |
| tree | 45d4d4c68c253830ea67cc91c3238d3768699672 /nova/compute | |
| parent | 50b9c032fdc520c1461ff4651b60b4fc4b8f8e19 (diff) | |
| parent | fd7a111cbfe77decfa5adda35793aae6ac7db6ba (diff) | |
Merge "Ability to read deleted system metadata records."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index deca04177..3cdf35266 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -761,12 +761,10 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state=vm_states.DELETED, task_state=None, terminated_at=timeutils.utcnow()) - # Pull the system_metadata before we delete the instance, so we - # can pass it to delete.end notification, as it will not be able - # to look it up anymore, if it needs it. - system_meta = self.db.instance_system_metadata_get(context, - instance_uuid) self.db.instance_destroy(context, instance_uuid) + with utils.temporary_mutation(context, read_deleted="yes"): + system_meta = self.db.instance_system_metadata_get(context, + instance_uuid) self._notify_about_instance_usage(context, instance, "delete.end", system_metadata=system_meta) |