Merge "Delete InstanceMapping in conductor if BuildRequest is already deleted"

Author: Zuul

nova/conductor/manager.py

@@ -1357,6 +1357,15 @@ def schedule_and_build_instances(self, context, build_requests,
                           'was already deleted.', instance=instance)
                 # This is a placeholder in case the quota recheck fails.
                 instances.append(None)
+                # If the build request was deleted and the instance is not
+                # going to be created, there is on point in leaving an orphan
+                # instance mapping so delete it.
+                try:
+                    im = objects.InstanceMapping.get_by_instance_uuid(
+                        context, instance.uuid)
+                    im.destroy()
+                except exception.InstanceMappingNotFound:
+                    pass
                 self.report_client.delete_allocation_for_instance(
                     context, instance.uuid)
                 continue

nova/tests/unit/conductor/test_conductor.py

@@ -2108,6 +2108,10 @@ def test_schedule_and_build_delete_before_scheduling(self, inst_create,
         self.assertFalse(bury.called)
         # we don't don't destroy the build request since it's already gone
         self.assertFalse(br_destroy.called)
+        # Make sure the instance mapping is gone.
+        self.assertRaises(exc.InstanceMappingNotFound,
+                          objects.InstanceMapping.get_by_instance_uuid,
+                          self.context, inst_uuid)
 
     @mock.patch('nova.compute.rpcapi.ComputeAPI.build_and_run_instance')
     @mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations')