Merge "Use excutils.save_and_reraise_exception instead of reraise"

This commit is contained in:
Zuul 2019-03-13 00:43:20 +00:00 committed by Gerrit Code Review
commit b347f9e31e
1 changed files with 1 additions and 5 deletions

View File

@ -1154,11 +1154,7 @@ def copy_image_to_volume(driver, context, volume, image_meta, image_location,
"%(volume_id)s",
{'volume_id': volume.id, 'image_id': image_id})
raise exception.ImageCopyFailure(reason=ex.stderr)
except exception.ImageUnacceptable as ex:
LOG.exception("Failed to copy image to volume: %(volume_id)s",
{'volume_id': volume.id})
raise exception.ImageUnacceptable(ex)
except exception.ImageTooBig as ex:
except (exception.ImageUnacceptable, exception.ImageTooBig):
with excutils.save_and_reraise_exception():
LOG.exception("Failed to copy image %(image_id)s to volume: "
"%(volume_id)s",