Check if snapshot is deleted cleanly.

This patch added a check in delete_snapshot to make sure the
snapshot is deleted cleanly.  Without this check, if someone
tries to delete the source volume immediately after the snapshot
deletion, it will fail with error that the volume still has
snapshot.

Closes-Bug: #1286699

Change-Id: Idf4508025b403fa572584e5204b3891375fed6c6

diff --git a/cinder/volume/drivers/emc/emc_smis_common.py b/cinder/volume/drivers/emc/emc_smis_common.py
index b15d76c1df825b0660bba94600b1b8e0f8c78961..5514e035b64ad9bd11c9d962a2a563a0db9ca052 100644 (file)
--- a/cinder/volume/drivers/emc/emc_smis_common.py
+++ b/cinder/volume/drivers/emc/emc_smis_common.py
@@ -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