diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-17 18:04:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-17 18:04:15 +0000 |
| commit | 97c08950ae660a4e60893d57f21f52657156b999 (patch) | |
| tree | 9f10352671f7aeb580ee3fa238ba310f13a11739 | |
| parent | 63cf95634395dc37bdd46fa7b7dfdbf47592d42a (diff) | |
| parent | fcbba45dcf09f6087fabfaff1bcb960f0693ae76 (diff) | |
Merge "InstanceNotFound exceptions for terminate_intance now Log warning instead of throwing exeptions."
| -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 |