openstack/cinder
Code Issues Proposed changes

Merge "Cloning a volume from a snapshot in thin lv"

Browse Source
This commit is contained in:
Jenkins 2017-08-02 21:13:13 +00:00 committed by Gerrit Code Review
commit b02c17ed8b
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cinder/tests/unit/volume/drivers/test_lvm_driver.py
View File

@ -212,9 +212,7 @@ class LVMVolumeDriverTestCase(test_driver.BaseDriverTestCase):
lvm_driver = lvm.LVMVolumeDriver(configuration=self.configuration, lvm_driver = lvm.LVMVolumeDriver(configuration=self.configuration,
db=db) db=db)
with mock.patch.object(lvm_driver, 'vg'), \ with mock.patch.object(lvm_driver, 'vg'):
mock.patch.object(lvm_driver, '_create_volume'), \
mock.patch.object(volutils, 'copy_volume') as mock_copy:
# Test case for thin LVM # Test case for thin LVM
lvm_driver._sparse_copy_volume = True lvm_driver._sparse_copy_volume = True
@ -225,16 +223,25 @@ class LVMVolumeDriverTestCase(test_driver.BaseDriverTestCase):
lvm_driver.create_volume_from_snapshot(dst_volume, lvm_driver.create_volume_from_snapshot(dst_volume,
snapshot_ref) snapshot_ref)
volume_path = lvm_driver.local_path(dst_volume) def test_create_volume_from_snapshot_sparse_extend(self):
snapshot_path = lvm_driver.local_path(snapshot_ref)
volume_size = 1024 self.configuration.lvm_type = 'thin'
block_size = '1M' lvm_driver = lvm.LVMVolumeDriver(configuration=self.configuration,
mock_copy.assert_called_with(snapshot_path, db=db)
volume_path,
volume_size, with mock.patch.object(lvm_driver, 'vg'), \
block_size, mock.patch.object(lvm_driver, 'extend_volume') as mock_extend:
execute=lvm_driver._execute,
sparse=True) # Test case for thin LVM
lvm_driver._sparse_copy_volume = True
src_volume = tests_utils.create_volume(self.context)
snapshot_ref = tests_utils.create_snapshot(self.context,
src_volume['id'])
dst_volume = tests_utils.create_volume(self.context)
dst_volume['size'] = snapshot_ref['volume_size'] + 1
lvm_driver.create_volume_from_snapshot(dst_volume,
snapshot_ref)
mock_extend.assert_called_with(dst_volume, dst_volume['size'])
@mock.patch.object(cinder.volume.utils, 'get_all_volume_groups', @mock.patch.object(cinder.volume.utils, 'get_all_volume_groups',
return_value=[{'name': 'cinder-volumes'}]) return_value=[{'name': 'cinder-volumes'}])

10
cinder/volume/drivers/lvm.py
View File

@ -409,6 +409,16 @@ class LVMVolumeDriver(driver.VolumeDriver):
def create_volume_from_snapshot(self, volume, snapshot): def create_volume_from_snapshot(self, volume, snapshot):
"""Creates a volume from a snapshot.""" """Creates a volume from a snapshot."""
if self.configuration.lvm_type == 'thin':
self.vg.create_lv_snapshot(volume['name'],
self._escape_snapshot(snapshot['name']),
self.configuration.lvm_type)
if volume['size'] > snapshot['volume_size']:
LOG.debug("Resize the new volume to %s.", volume['size'])
self.extend_volume(volume, volume['size'])
self.vg.activate_lv(volume['name'], is_snapshot=True,
permanent=True)
return
self._create_volume(volume['name'], self._create_volume(volume['name'],
self._sizestr(volume['size']), self._sizestr(volume['size']),
self.configuration.lvm_type, self.configuration.lvm_type,