Merge "Ability to read deleted system metadata records."

2 files changed, 5 insertions, 7 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)
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 66102d8c0..9bf3a0e12 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -4239,8 +4239,8 @@ def instance_metadata_update(context, instance_uuid, metadata, delete):
 # System-owned metadata
 
 def _instance_system_metadata_get_query(context, instance_uuid, session=None):
-    return model_query(context, models.InstanceSystemMetadata, session=session,
-                       read_deleted="no").\
+    return model_query(context, models.InstanceSystemMetadata,
+                       session=session).\
                     filter_by(instance_uuid=instance_uuid)