]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "LVM: Support efficient data copy using "dd" for create_cloned_volume"
authorJenkins <jenkins@review.openstack.org>
Thu, 14 May 2015 04:12:27 +0000 (04:12 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 14 May 2015 04:12:27 +0000 (04:12 +0000)
1  2 
cinder/volume/drivers/lvm.py
cinder/volume/utils.py

Simple merge
index bccb7714ed832ab5a63c1f2c40e58273453da5ac,85fb84a798c34db1acef220f6c2feaabfddf8eae..63b857d9f044524e5d549caa2021152823c95d38
@@@ -350,8 -358,10 +357,10 @@@ def clear_volume(volume_size, volume_pa
      if volume_clear_ionice is None:
          volume_clear_ionice = CONF.volume_clear_ionice
  
 -    LOG.info(_LI("Performing secure delete on volume: %s") % volume_path)
 +    LOG.info(_LI("Performing secure delete on volume: %s"), volume_path)
  
+     # We pass sparse=False explicitly here so that zero blocks are not
+     # skipped in order to clear the volume.
      if volume_clear == 'zero':
          return copy_volume('/dev/zero', volume_path, volume_clear_size,
                             CONF.volume_dd_blocksize,