openstack/shade
Code Issues Proposed changes

Merge "Delete image if we timeout waiting for it to upload"

Browse Source
This commit is contained in:
Jenkins 2016-11-07 19:05:21 +00:00 committed by Gerrit Code Review
commit 5acf1e3426
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shade/openstackcloud.py
View File

@ -3110,12 +3110,18 @@ class OpenStackCloud(_normalize.Normalizer):
self._get_cache(None).invalidate()
if not wait:
return image
for count in _utils._iterate_timeout(
60,
"Timeout waiting for the image to finish."):
image_obj = self.get_image(image.id)
if image_obj and image_obj.status not in ('queued', 'saving'):
return image_obj
try:
for count in _utils._iterate_timeout(
60,
"Timeout waiting for the image to finish."):
image_obj = self.get_image(image.id)
if image_obj and image_obj.status not in ('queued', 'saving'):
return image_obj
except OpenStackCloudTimeout:
self.log.debug(
"Timeout waiting for image to become ready. Deleting.")
self.delete_image(image.id, wait=True)
raise
def _upload_image_task(
self, name, filename, container, current_image,