diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-05 17:10:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-05 17:10:53 +0000 |
| commit | f31ab49e311b47c031b70de30afd445973d4feff (patch) | |
| tree | a7143a5ac4e779acfb4ded8a35f5095b6ffeda07 | |
| parent | c4e5d655e64b3b707fbfdfac11ffbcc8c8bf3660 (diff) | |
| parent | 7ab0489bc4f15fdc6025056c2d9e08543fde5129 (diff) | |
| download | nova-f31ab49e311b47c031b70de30afd445973d4feff.tar.gz nova-f31ab49e311b47c031b70de30afd445973d4feff.tar.xz nova-f31ab49e311b47c031b70de30afd445973d4feff.zip | |
Merge "Log a certain rare instance termination exception"
| -rw-r--r-- | nova/compute/manager.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index eee4d303c..09dbc6911 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -389,20 +389,18 @@ class ComputeManager(manager.SchedulerDependentManager): def _shutdown_instance_even_if_deleted(self, context, instance_uuid): """Call terminate_instance even for already deleted instances""" - LOG.info(_("Going to force the deletion of the vm %(instance_uuid)s, " - "even if it is deleted") % locals()) try: try: self.terminate_instance(context, instance_uuid) except exception.InstanceNotFound: - LOG.info(_("Instance %(instance_uuid)s did not exist in the " - "DB, but I will shut it down anyway using a special " - "context") % locals()) - ctxt = nova.context.get_admin_context('yes') + LOG.info(_("Instance already deleted from database. " + "Attempting forceful vm deletion"), + instance=instance_uuid) + ctxt = nova.context.get_admin_context(read_deleted='yes') self.terminate_instance(ctxt, instance_uuid) except Exception as ex: - LOG.info(_("exception terminating the instance " - "%(instance_uuid)s") % locals()) + LOG.exception(_("Exception encountered while terminating the " + "instance"), instance=instance_uuid) def _run_instance(self, context, instance_uuid, requested_networks=None, |