Use excutils.save_and_reraise_exception instead of reraise
Change-Id: I6fef1f8d0e1cb226e25b8bc526d7438a67722cf3
This commit is contained in:
parent
6785bf614b
commit
00c82f68da
@ -1154,11 +1154,7 @@ def copy_image_to_volume(driver, context, volume, image_meta, image_location,
|
|||||||
"%(volume_id)s",
|
"%(volume_id)s",
|
||||||
{'volume_id': volume.id, 'image_id': image_id})
|
{'volume_id': volume.id, 'image_id': image_id})
|
||||||
raise exception.ImageCopyFailure(reason=ex.stderr)
|
raise exception.ImageCopyFailure(reason=ex.stderr)
|
||||||
except exception.ImageUnacceptable as ex:
|
except (exception.ImageUnacceptable, exception.ImageTooBig):
|
||||||
LOG.exception("Failed to copy image to volume: %(volume_id)s",
|
|
||||||
{'volume_id': volume.id})
|
|
||||||
raise exception.ImageUnacceptable(ex)
|
|
||||||
except exception.ImageTooBig as ex:
|
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
LOG.exception("Failed to copy image %(image_id)s to volume: "
|
LOG.exception("Failed to copy image %(image_id)s to volume: "
|
||||||
"%(volume_id)s",
|
"%(volume_id)s",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user