Make invirt-lvm lvcreate-all use sqlalchemy correctly.

[invirt/packages/invirt-remote.git] / host / usr / sbin / invirt-lvm

diff --git a/host/usr/sbin/invirt-lvm b/host/usr/sbin/invirt-lvm
index 22a7805..6860d9c 100755 (executable)
--- a/host/usr/sbin/invirt-lvm
+++ b/host/usr/sbin/invirt-lvm
@@ -22,13 +22,21 @@ def ensureoff(machine):
     rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
               stderr=PIPE)
 
+machine_specific = subcommand not in ['lvcreate-all', 'vgcapacity']
+
+if machine_specific:
+    machine = sys.argv[2]
+    disk = sys.argv[3]
+    lvname = prefix + machine + "_" + disk
+    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)):
@@ -38,12 +46,7 @@ if subcommand == "lvcreate-all":
             if rv != 0:
                 print >>sys.stderr, "Error creating LV %s\n" %(lvname,)
                 sys.exit(1)
-else:
-    machine = sys.argv[2]
-    disk = sys.argv[3]
-    lvname = prefix + machine + "_" + disk
-    lvpath = "/dev/" + vg + "/" + lvname
-if subcommand == "lvremove":
+elif subcommand == "lvremove":
     def error():
         print >>sys.stderr, "Error removing LV %s\n" % lvname
         sys.exit(1)
@@ -63,15 +66,9 @@ if subcommand == "lvremove":
             break
     ensureoff(machine)
     
-    # Fork. The child process wipes the LV and then deletes
-    # it. There's not really anything sane to do with errors (since
-    # this is running non-interactively), so let's just drop them on
-    # the floor for now.
-    if os.fork() == 0:
-        call(["/bin/dd", "if=/dev/zero", "of=%s" % new_lvpath])
-        call(["/sbin/lvchange", "-a", "n", new_lvpath])
-        call(["/sbin/lvchange", "-a", "ey", new_lvpath])
-        call(["/sbin/lvremove", "--force", new_lvpath])
+    # Touch a file corresponding to the new name of the LV; a separate
+    # daemon will handle wiping and deleting it.
+    open(os.path.join('/var/lib/invirt-remote/cleanup', new_lvname), 'w')
 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
@@ -99,4 +96,23 @@ elif subcommand == "lvcreate":
     if rv != 0:
         print >>sys.stderr, "Error creating LV %s\n" %(lvname,)
         sys.exit(1)
+elif subcommand == "vgcapacity":
+    p = Popen(["/sbin/vgs", "-o", "vg_extent_size,vg_extent_count,vg_free_count", 
+                            "--noheadings", "--units", "k", "--nosuffix", "--separator", ":", 
+                            vg],
+              stdout=PIPE, stderr=PIPE)
+    out,err = p.communicate()
+    
+    try:
+        fields = out.strip().split(':')
+        extent_size = float(fields[0]) # in kibibytes
+        extent_count = int(fields[1])
+        free_count = int(fields[2])
+        total_space_TiB = extent_size * extent_count / 1024.**3
+        free_space_TiB = extent_size * free_count / 1024.**3
+        print >>sys.stdout, "Total: %.3f TiB" % (total_space_TiB,)
+        print >>sys.stdout, "Free: %.3f TiB" % (free_space_TiB,)
+    except:
+        print >>sys.stderr, "Error obtaining vg capacity:\n%s\n" % (err,)
+        sys.exit(1)