summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/manager.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c228bc372..9310f208a 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -693,7 +693,10 @@ class ComputeManager(manager.SchedulerDependentManager):
elevated = context.elevated()
instance = self.db.instance_get_by_uuid(elevated, instance_uuid)
compute_utils.notify_usage_exists(instance, current_period=True)
- self._delete_instance(context, instance)
+ try:
+ self._delete_instance(context, instance)
+ except exception.InstanceNotFound as e:
+ LOG.warn(e)
@exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@checks_instance_lock