Permalink
Browse files

InstanceNotFound exceptions for terminate_intance now Log warning

instead of throwing exeptions.

fixes bug 933012

Change-Id: Ib6c6c33e26125b561bd5a1bc1e710016746e7e44
  • Loading branch information...
Nikhil Komawar
Nikhil Komawar committed Feb 17, 2012
1 parent e45b8bf commit fcbba45dcf09f6087fabfaff1bcb960f0693ae76
Showing with 4 additions and 1 deletion.
  1. +4 −1 nova/compute/manager.py
View
@@ -693,7 +693,10 @@ def terminate_instance(self, context, instance_uuid):
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

0 comments on commit fcbba45

Please sign in to comment.