openstack/freezer
Code Issues Proposed changes

Merge "Fix cinder mode backup fail into an infinite loop"

Browse Source
This commit is contained in:
Jenkins 2017-07-20 15:39:14 +00:00 committed by Gerrit Code Review
commit ccb93b19e5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freezer/openstack/osclients.py
View File

@ -288,9 +288,15 @@ class OSClientManager(object):
LOG.info("Image status: " + image.status) LOG.info("Image status: " + image.status)
image = self.get_glance().images.get(image.id) image = self.get_glance().images.get(image.id)
if image.status in ("killed", "deleted"): if image.status in ("killed", "deleted"):
raise Exception("Image have killed state") raise RuntimeError("Image in killed or deleted state")
except RuntimeError:
if image.status == 'killed':
LOG.info("Delete image in killed state " + image_id)
self.get_glance().images.delete(image_id)
raise
except Exception as e: except Exception as e:
if image.status in ("killed", "deleted"): if hasattr(e, 'code') and e.code == 404:
LOG.warning('Image is not found ' + image_id)
raise raise
LOG.exception(e) LOG.exception(e)
LOG.warning("Exception getting image status") LOG.warning("Exception getting image status")