openstack/deb-cinder
Code Issues Proposed changes

Merge "Check if snapshot is deleted cleanly."

Browse Source
This commit is contained in:
Jenkins 2014-03-05 12:32:56 +00:00 committed by Gerrit Code Review
commit bbe2ab28ae
1 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
cinder/volume/drivers/emc/emc_smis_common.py
View File

@ -680,6 +680,47 @@ class EMCSMISCommon():
raise exception.VolumeBackendAPIException(
data=exception_message)
# It takes a while for the relationship between the snapshot
# and the source volume gets cleaned up. Needs to wait until
# it is cleaned up. Otherwise, the source volume can't be
# deleted immediately after the snapshot deletion because it
# still has snapshot.
wait_timeout = int(self._get_timeout())
wait_interval = 10
start = int(time.time())
while True:
try:
sync_name, storage_system =\
self._find_storage_sync_sv_sv(snapshot, volume, False)
if sync_name is None:
LOG.info(_('Snapshot: %(snapshot)s: volume: %(volume)s. '
'Snapshot is deleted.')
% {'snapshot': snapshotname,
'volume': volumename})
break
time.sleep(wait_interval)
if int(time.time()) - start >= wait_timeout:
LOG.warn(_('Snapshot: %(snapshot)s: volume: %(volume)s. '
'Snapshot deleted but cleanup timed out.')
% {'snapshot': snapshotname,
'volume': volumename})
break
except Exception as ex:
if ex.args[0] == 6:
# 6 means object not found, so snapshot is deleted cleanly
LOG.info(_('Snapshot: %(snapshot)s: volume: %(volume)s. '
'Snapshot is deleted.')
% {'snapshot': snapshotname,
'volume': volumename})
else:
LOG.warn(_('Snapshot: %(snapshot)s: volume: %(volume)s. '
'Snapshot deleted but error during cleanup. '
'Error: %(error)s')
% {'snapshot': snapshotname,
'volume': volumename,
'error': str(ex.args)})
break
LOG.debug(_('Leaving delete_snapshot: Volume: %(volumename)s '
'Snapshot: %(snapshotname)s Return code: %(rc)lu.')
% {'volumename': volumename,
@ -1041,6 +1082,24 @@ class EMCSMISCommon():
LOG.debug(_("Masking View not found."))
return None
def _get_timeout(self, filename=None):
if filename is None:
filename = self.configuration.cinder_emc_config_file
file = open(filename, 'r')
data = file.read()
file.close()
dom = parseString(data)
timeouts = dom.getElementsByTagName('Timeout')
if timeouts is not None and len(timeouts) > 0:
timeout = timeouts[0].toxml().replace('<Timeout>', '')
timeout = timeout.replace('</Timeout>', '')
LOG.debug(_("Found Timeout: %s") % (timeout))
return timeout
else:
LOG.debug(_("Timeout not specified."))
return 10
def _get_ecom_cred(self, filename=None):
if filename is None:
filename = self.configuration.cinder_emc_config_file