Remove missing PVs before removing obsolete VG (#481698).

Missing PV (e.g. due to drive removal) of obsolete VG
can make lvm vgremove call fail.
Also add verbose flag to pvremove call.

1 files changed, 12 insertions, 2 deletions

diff --git a/lvm.py b/lvm.py
index 0272ca58b..0439304f5 100644
--- a/lvm.py
+++ b/lvm.py
@@ -166,7 +166,17 @@ def vgremove(vgname):
     except:
         pass
 
-    args = ["lvm", "vgremove", vgname]
+    args = ["lvm", "vgreduce", "-v", "--removemissing", "--force", vgname]
+
+    log(string.join(args, ' '))
+    rc = iutil.execWithRedirect(args[0], args,
+                                stdout = output,
+                                stderr = output,
+                                searchPath = 1)
+    if rc:
+        raise SystemError, "vgreduce failed"
+
+    args = ["lvm", "vgremove", "-v", vgname]
 
     log(string.join(args, ' '))
     rc = iutil.execWithRedirect(args[0], args,
@@ -178,7 +188,7 @@ def vgremove(vgname):
     # now iterate all the PVs we've just freed up, so we reclaim the metadata
     # space.  This is an LVM bug, AFAICS.
     for pvname in pvs:
-        args = ["lvm", "pvremove", pvname]
+        args = ["lvm", "pvremove", "-ff", "-y", "-v", pvname]
 
         log(string.join(args, ' '))
         rc = iutil.execWithRedirect(args[0], args,