lvutil: use wipefs not dd to clear existing signatures (xapi-project#624

) Signed-off-by: Yann Dirson <[email protected]>
xcp-ng · Jul 6, 2023 · f7d8efe · f7d8efe
1 parent a82ff6c
commit f7d8efe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
@@ -881,6 +881,12 @@
             <value>460</value>
         </code>
 
+        <code>
+            <name>WipeFS</name>
+            <description>Failed to wipe pre-existing filesystem signature.</description>
+            <value>461</value>
+        </code>
+
         <code>
             <name>GenericException</name>
             <description>SM has thrown a generic python exception</description>

diff --git a/drivers/lvutil.py b/drivers/lvutil.py
@@ -503,24 +503,12 @@ def createVG(root, vgname):
 
         f = _openExclusive(dev, True)
         os.close(f)
+
+        # Wipe any fs signature
         try:
-            # Overwrite the disk header, try direct IO first
-            cmd = [util.CMD_DD, "if=/dev/zero", "of=%s" % dev, "bs=1M",
-                    "count=10", "oflag=direct"]
-            util.pread2(cmd)
+            util.wipefs(dev)
         except util.CommandException as inst:
-            if inst.code == errno.EPERM:
-                try:
-                    # Overwrite the disk header, try normal IO
-                    cmd = [util.CMD_DD, "if=/dev/zero", "of=%s" % dev,
-                            "bs=1M", "count=10"]
-                    util.pread2(cmd)
-                except util.CommandException as inst:
-                    raise xs_errors.XenError('LVMWrite', \
-                          opterr='device %s' % dev)
-            else:
-                raise xs_errors.XenError('LVMWrite', \
-                      opterr='device %s' % dev)
+            raise xs_errors.XenError('WipeFS', opterr='device %s' % dev) # from inst
 
         if not (dev == rootdev):
             try:

diff --git a/drivers/util.py b/drivers/util.py
@@ -637,6 +637,17 @@ def zeroOut(path, fromByte, bytes):
     return True
 
 
+def wipefs(blockdev):
+    "Wipe filesystem signatures from `blockdev`"
+    cmdlist = ["wipefs", "-a", blockdev]
+    SMlog("Running command: %s" % cmdlist)
+    (rc, stdout, stderr) = doexec(cmdlist)
+    if rc != 0:
+        SMlog("FAILED in util.wipefs: (rc %d) stdout: '%s', stderr: '%s'" %
+              (rc, stdout, stderr))
+        raise CommandException(rc, str(cmdlist), stderr.strip())
+
+
 def match_rootdev(s):
     regex = re.compile("^PRIMARY_DISK")
     return regex.search(s, 0)