From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 14 May 2015 04:12:27 +0000 (+0000)
Subject: Merge "LVM: Support efficient data copy using "dd" for create_cloned_volume"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=92d17118d050f57f94cf598ed79411942be5bd2b;p=openstack-build%2Fcinder-build.git

Merge "LVM: Support efficient data copy using "dd" for create_cloned_volume"
---

92d17118d050f57f94cf598ed79411942be5bd2b
diff --cc cinder/volume/utils.py
index bccb7714e,85fb84a79..63b857d9f
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@@ -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,