linstor: Fix to add sync to DD

Signed-off-by: Damien Thenot <damien.thenot@vates.tech>
xcp-ng · Nov 20, 2024 · f9e99e6 · f9e99e6
1 parent 6d2b2d1
commit f9e99e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/drivers/util.py b/drivers/util.py
@@ -610,7 +610,7 @@ def zeroOut(path, fromByte, bytes):
             bytesBefore = bytes
         bytes -= bytesBefore
         cmd = [CMD_DD, "if=/dev/zero", "of=%s" % path, "bs=1",
-               "seek=%s" % fromByte, "count=%s" % bytesBefore]
+               "seek=%s" % fromByte, "count=%s" % bytesBefore, "conv=fsync"]
         try:
             pread2(cmd)
         except CommandException:
@@ -621,15 +621,15 @@ def zeroOut(path, fromByte, bytes):
     fromByte = (fromBlock + blocks) * blockSize
     if blocks:
         cmd = [CMD_DD, "if=/dev/zero", "of=%s" % path, "bs=%s" % blockSize,
-               "seek=%s" % fromBlock, "count=%s" % blocks]
+               "seek=%s" % fromBlock, "count=%s" % blocks, "conv=fsync"]
         try:
             pread2(cmd)
         except CommandException:
             return False
 
     if bytes:
         cmd = [CMD_DD, "if=/dev/zero", "of=%s" % path, "bs=1",
-               "seek=%s" % fromByte, "count=%s" % bytes]
+               "seek=%s" % fromByte, "count=%s" % bytes, "conv=fsync"]
         try:
             pread2(cmd)
         except CommandException:

diff --git a/tests/test_util.py b/tests/test_util.py
@@ -612,7 +612,7 @@ def test_zero_out_two_aligned_blocks(self):
         # Arrange
         self._add_process(
             [DD_CMD, "if=/dev/zero", "of=/test/path/foo", "bs=4096",
-             "seek=0", "count=2"],
+             "seek=0", "count=2", "conv=fsync"],
             0, b"", b"")
         # Act
         result = util.zeroOut('/test/path/foo', 0, 8192)
@@ -624,11 +624,11 @@ def test_zero_out_misaligned_blocks(self):
         # Arrange
         self._add_process(
             [DD_CMD, "if=/dev/zero", "of=/test/path/foo", "bs=1",
-             "seek=1024", "count=3072"],
+             "seek=1024", "count=3072", "conv=fsync"],
             0, b"", b"")
         self._add_process(
             [DD_CMD, "if=/dev/zero", "of=/test/path/foo", "bs=1",
-             "seek=4096", "count=100"],
+             "seek=4096", "count=100", "conv=fsync"],
             0, b"", b"")
 
         # Act
@@ -641,7 +641,7 @@ def test_zero_out_small_block(self):
         # Arrange
         self._add_process(
             [DD_CMD, "if=/dev/zero", "of=/test/path/foo", "bs=1",
-             "seek=1024", "count=2048"],
+             "seek=1024", "count=2048", "conv=fsync"],
             0, b"", b"")
 
         # Act