openstack/cinder
Code Issues Proposed changes

Merge "Don't leave snapshots on the floor" into stable/icehouse

Browse Source
This commit is contained in:
Jenkins 2014-07-26 21:56:28 +00:00 committed by Gerrit Code Review
commit dfc0505ca3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,16 +291,17 @@ class LVMVolumeDriver(driver.VolumeDriver):
'id': temp_id}
self.create_snapshot(temp_snapshot)
self._create_volume(volume['name'],
self._sizestr(volume['size']),
self.configuration.lvm_type,
mirror_count)
self.vg.activate_lv(temp_snapshot['name'], is_snapshot=True)
# copy_volume expects sizes in MiB, we store integer GiB
# be sure to convert before passing in
try:
self._create_volume(volume['name'],
self._sizestr(volume['size']),
self.configuration.lvm_type,
mirror_count)
self.vg.activate_lv(temp_snapshot['name'], is_snapshot=True)
volutils.copy_volume(
self.local_path(temp_snapshot),
self.local_path(volume),