openstack/nova
Code Issues Proposed changes

Merge "Use _error_out_instance_on_exception in finish_resize"

Browse Source
This commit is contained in:
Jenkins
2017-07-26 16:16:42 +00:00
committed by Gerrit Code Review
parent 84e1f467db 9dd035ea40
commit f575ccbda9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/compute/manager.py
View File

@@ -4001,15 +4001,10 @@ class ComputeManager(manager.Manager):
new host machine. new host machine.
""" """
try: with self._error_out_instance_on_exception(context, instance):
image_meta = objects.ImageMeta.from_dict(image) image_meta = objects.ImageMeta.from_dict(image)
self._finish_resize(context, instance, migration, self._finish_resize(context, instance, migration,
disk_info, image_meta) disk_info, image_meta)
except Exception:
LOG.exception('Setting instance vm_state to ERROR',
instance=instance)
with excutils.save_and_reraise_exception():
self._set_instance_obj_error_state(context, instance)
@wrap_exception() @wrap_exception()
@wrap_instance_fault @wrap_instance_fault