Merge "ensure zeros are written out when clearing volumes"

1 files changed, 5 insertions, 1 deletions

diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 1830cac33..b8e0cafec 100755
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -237,6 +237,7 @@ def clear_logical_volume(path):
     vol_size = logical_volume_size(path)
     bs = 1024 * 1024
     direct_flags = ('oflag=direct',)
+    sync_flags = ()
     remaining_bytes = vol_size
 
     # The loop caters for versions of dd that
@@ -248,11 +249,14 @@ def clear_logical_volume(path):
                     'if=/dev/zero', 'of=%s' % path,
                     'seek=%s' % seek_blocks, 'count=%s' % zero_blocks)
         zero_cmd += direct_flags
+        zero_cmd += sync_flags
         if zero_blocks:
             utils.execute(*zero_cmd, run_as_root=True)
         remaining_bytes %= bs
         bs /= 1024  # Limit to 3 iterations
-        direct_flags = ()  # Only use O_DIRECT with initial block size
+        # Use O_DIRECT with initial block size and fdatasync otherwise
+        direct_flags = ()
+        sync_flags = ('conv=fdatasync',)
 
 
 def remove_logical_volumes(*paths):