openstack
/
freezer
Code Issues Proposed changes

Merge "Optimize cinder mode backup in special cases"

This commit is contained in:
Jenkins 2017-05-15 16:38:35 +00:00 committed by Gerrit Code Review
parent a9f529937f 9f0aef1266
commit fdf8f07810
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freezer/openstack/osclients.py
View File

@ -211,11 +211,13 @@ class OSClientManager(object):
LOG.debug("Snapshot status: " + snapshot.status)
snapshot = self.get_cinder().volume_snapshots.get(snapshot.id)
if snapshot.status == "error":
raise Exception("snapshot has error state")
raise RuntimeError("snapshot has error state")
time.sleep(5)
except RuntimeError:
LOG.info("Delete snapshot in error state " + snapshot.id)
self.get_cinder().volume_snapshots.delete(snapshot)
raise
except Exception as e:
if str(e) == "snapshot has error state":
raise
LOG.exception(e)
return snapshot
@ -233,7 +235,13 @@ class OSClientManager(object):
try:
LOG.info("Volume copy status: " + volume.status)
volume = self.get_cinder().volumes.get(volume.id)
if volume.status == "error":
raise RuntimeError("Volume copy has error state")
time.sleep(5)
except RuntimeError:
LOG.info("Delete volume in error state " + volume.id)
self.get_cinder().volumes.delete(volume.id)
raise
except Exception as e:
LOG.exception(e)
LOG.warning("Exception getting volume status")