Explicitly lock an LV before trying to delete it

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-lvm

diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm
index 15965cd..00766f6 100755 (executable)
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -20,9 +20,9 @@ def ensureoff(machine):
               stderr=PIPE)
 
 if subcommand == "lvcreate-all":
               stderr=PIPE)
 
 if subcommand == "lvcreate-all":

-    from sipb_xen_database import *
+    from invirt import database

     import re
     import re

-    connect(config.db.uri)
+    database.connect()

     for d in Disk.select():
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
         machine = Machine.get(d.machine_id)
     for d in Disk.select():
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
         machine = Machine.get(d.machine_id)

@@ -41,11 +41,19 @@ else:
     lvname = prefix + machine + "_" + disk
     lvpath = "/dev/" + vg + "/" + lvname
 if subcommand == "lvremove":
     lvname = prefix + machine + "_" + disk
     lvpath = "/dev/" + vg + "/" + lvname
 if subcommand == "lvremove":

+    def error():
+        print >>sys.stderr, "Error removing LV %s\n" % lvname
+        sys.exit(1)
+    rv = call(["/sbin/lvchange", "-a", "n", lvpath])
+    if rv != 0:
+        error()
+    rv = call(["/sbin/lvchange", "-a", "ey", lvpath])
+    if rv != 0:
+        error()

     rv = call(["/sbin/lvremove", "--force", lvpath])
     rv = call(["/sbin/lvremove", "--force", lvpath])

-    ensureoff(machine)

     if rv != 0:
     if rv != 0:

-        print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
-        sys.exit(1)
+        error()
+    ensureoff(machine)

 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)