Merge pull request #16 from Huawei/2.2.RC2

2.2.RC2 SPH100
Huawei · Dec 19, 2020 · 49a33bf · 49a33bf
2 parents f6094d3 + 366383a
commit 49a33bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Cinder/Mitaka/dsware.py b/Cinder/Mitaka/dsware.py
@@ -995,13 +995,7 @@ def delete_volume(self, volume):
             LOG.debug("not openstack qos: %s did not delete it", str(vol_qos))
             self._dsware_disasso_qos(vol_qos['qos_name'], volume_name)
 
-        # delete volume
-        # check quick start
-        if self._check_quick_start(volume.get('id')):
-            LOG.debug("[DSW-DRIVER] start deleting linked_clone volume ")
-            return self._quick_delete_volume(volume)
-        else:
-            return self._delete_volume(volume_name)
+        return self._delete_volume(volume_name)
 
     def _get_snapshot(self, snapshot_name):
         snapshot_info = self.dsware_client.query_snap(snapshot_name)

diff --git a/Cinder/Mitaka/fspythonapi.py b/Cinder/Mitaka/fspythonapi.py
@@ -373,7 +373,7 @@ def create_fullvol_from_snap(self, vol_name, snap_name):
 
     def create_linked_clone_volume(self, vol_name,
                                    vol_size, src_vol_name):
-        tmp_snap_name = str(src_vol_name) + '_linked_clone_snap'
+        tmp_snap_name = str(src_vol_name) + str(vol_name)
 
         ret_code = self.create_snapshot(tmp_snap_name, src_vol_name, 0)
         if 0 != ret_code: