diff options
| author | Nikhil Komawar <nikhil.komawar@rackspace.com> | 2012-02-17 02:24:08 +0000 |
|---|---|---|
| committer | Nikhil Komawar <nikhil.komawar@rackspace.com> | 2012-02-17 16:45:09 +0000 |
| commit | fcbba45dcf09f6087fabfaff1bcb960f0693ae76 (patch) | |
| tree | 19975abaef49a7753efa866f41a7557b2fb47a9c | |
| parent | e45b8bf0a4b40179319522ccd72bba69565caec6 (diff) | |
| download | nova-fcbba45dcf09f6087fabfaff1bcb960f0693ae76.tar.gz nova-fcbba45dcf09f6087fabfaff1bcb960f0693ae76.tar.xz nova-fcbba45dcf09f6087fabfaff1bcb960f0693ae76.zip | |
InstanceNotFound exceptions for terminate_intance now Log warning
instead of throwing exeptions.
fixes bug 933012
Change-Id: Ib6c6c33e26125b561bd5a1bc1e710016746e7e44
| -rw-r--r-- | nova/compute/manager.py | 5 |
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 |