X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/9b2c6cb76b2935133c0c1ed1626d077614b460ec..6351ca8322960a058222b72abac4a9728ac1e87e:/host/usr/sbin/invirt-lvm

diff --git a/host/usr/sbin/invirt-lvm b/host/usr/sbin/invirt-lvm
index a042f0e..58e6c1c 100755
--- a/host/usr/sbin/invirt-lvm
+++ b/host/usr/sbin/invirt-lvm
@@ -22,7 +22,12 @@ def ensureoff(machine):
     rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
               stderr=PIPE)
 
-machine_specific = subcommand not in ['lvcreate-all', 'vgcapacity']:
+def lvm_activation(path, mode):
+    p = Popen(["/sbin/lvchange", "-a%s" % (mode,), path], stdout=PIPE, stderr=PIPE)
+    rv = p.wait()
+    return rv
+
+machine_specific = subcommand not in ['lvcreate-all', 'vgcapacity']
 
 if machine_specific:
     machine = sys.argv[2]
@@ -31,12 +36,12 @@ if machine_specific:
     lvpath = "/dev/" + vg + "/" + lvname
 
 if subcommand == "lvcreate-all":
-    from invirt import database
+    from invirt.database import models, connect
     import re
-    database.connect()
-    for d in Disk.select():
+    connect()
+    for d in models.Disk.query().all():
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-        machine = Machine.get(d.machine_id)
+        machine = models.Machine.query().filter_by(machine_id=d.machine_id).one()
         check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
         lvname = prefix + machine.name + "_" + d.guest_device_name
         if not os.path.exists("/dev/%s/%s" % (vg, lvname)):
@@ -53,6 +58,9 @@ elif subcommand == "lvremove":
     
     # Rename the LV to something else so we can wipe it before reusing
     # the space
+    if lvm_activation(lvpath, 'n') != 0:
+        print >>sys.stderr, "Could not deactivate LV %s", % (lvname,)
+        sys.exit(1)
     while True:
         new_lvname = "old_%s_%s" % (lvname, ''.join(random.choice(string.ascii_letters) for i in xrange(6)))
         new_lvpath = "/dev/%s/%s" % (vg, new_lvname)
@@ -63,6 +71,9 @@ elif subcommand == "lvremove":
         elif rv != 0:
             error()
         else:
+            if lvm_activation(new_lvpath, 'y') != 0:
+                print >> sys.stderr, "Could not reactivate renamed LV %s" % (lvname,)
+                sys.exit(1)
             break
     ensureoff(machine)
     
@@ -72,6 +83,9 @@ elif subcommand == "lvremove":
 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
+    if lvm_activation(lvpath, 'n') != 0:
+        print >>sys.stderr, "Could not deactivate LV %s", % (lvname,)
+        sys.exit(1)
     p = Popen(["/sbin/lvresize", "-L", size + "M", lvpath],
               stdin=PIPE, stderr=PIPE)
     print >> p.stdin, 'y'
@@ -80,16 +94,27 @@ elif subcommand == "lvresize":
         print >> sys.stderr, "Error resizing LV %s:\n" %(lvname,)
         print >> sys.stderr, err
         sys.exit(1)
+    if lvm_activation(lvpath, 'y') != 0:
+        print >> sys.stderr, "Could not reactivate resized LV %s" % (lvname,)
+        sys.exit(1)
     print >> sys.stderr, err
 elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk
     ensureoff(machine)
-    ensureoff(newmachine)    
+    ensureoff(newmachine)
+    lvpath = "/dev/" + vg + "/" + lvname
+    new_lvpath = "/dev/" + vg + "/" + newlvname
+    if lvm_activation(lvpath, 'n') != 0:
+        print >>sys.stderr, "Could not deactivate LV %s", % (lvname,)
+        sys.exit(1)
     rv = call(["/sbin/lvrename", vg, lvname, newlvname])
     if rv != 0:
         print >>sys.stderr, "Error renaming LV %s\n" %(lvname,)
         sys.exit(1)
+    if lvm_activation(new_lvpath, 'y') != 0:
+        print >> sys.stderr, "Could not reactivate renamed LV %s" % (lvname,)
+        sys.exit(1)
 elif subcommand == "lvcreate":
     size = sys.argv[4]
     rv = call(["/sbin/lvcreate", "-L", size + "M", "-n", lvname, vg])