X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/f7b18eb6cf1b1130b626ae6d9d69934d6403e7e4..81b79ed73dd05f108f7330ae98435f1903bff447:/files/usr/sbin/sipb-xen-lvm

diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm
index bc375a7..f42804e 100755
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -2,7 +2,8 @@
 
 import sys
 import os.path
-from subprocess import call
+from subprocess import call, PIPE, Popen
+from invirt.config import structs as config
 
 def check(b):
     if not b:
@@ -12,29 +13,52 @@ vg = "xenvg"
 prefix = "d_"
 
 subcommand = sys.argv[1]
-machine = sys.argv[2]
-disk = sys.argv[3]
-lvname = prefix + machine + "_" + disk
-lvpath = "/dev/" + vg + "/" + lvname
 
 def ensureoff(machine):
     # Make sure the machine is off, but we don't care about errors if it is already off.
-    rv = call(["/usr/sbin/xm", "destroy", prefix + machine]
+    rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
+              stderr=PIPE)
 
+if subcommand == "lvcreate-all":
+    from invirt import database
+    import re
+    database.connect()
+    for d in Disk.select():
+        check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
+        machine = Machine.get(d.machine_id)
+        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)):
+            # LV doesn't exist
+            print >>sys.stderr, "Creating LV %s..." % (lvname,)
+            rv = call(["/sbin/lvcreate", "-L", str(d.size) + "M", "-n", lvname, vg])
+            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":
     rv = call(["/sbin/lvremove", "--force", lvpath])
     ensureoff(machine)
     if rv != 0:
         print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
         sys.exit(1)
-else if subcommand == "lvresize":
+elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
-    rv = call(["/sbin/lvresize", "-L", size + "M", lvpath])
-    if rv != 0:
-        print >>sys.stderr, "Error resizing LV %s\n" %(lvname,)
+    p = Popen(["/sbin/lvresize", "-L", size + "M", lvpath],
+              stdin=PIPE, stderr=PIPE)
+    print >> p.stdin, 'y'
+    err = p.stderr.read()
+    if p.wait() != 0 and 'matches existing size' not in err:
+        print >> sys.stderr, "Error resizing LV %s:\n" %(lvname,)
+        print >> sys.stderr, err
         sys.exit(1)
-else if subcommand == "lvrename":
+    print >> sys.stderr, err
+elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk
     ensureoff(machine)
@@ -43,27 +67,11 @@ else if subcommand == "lvrename":
     if rv != 0:
         print >>sys.stderr, "Error renaming LV %s\n" %(lvname,)
         sys.exit(1)
-else if subcommand == "lvcreate":
+elif subcommand == "lvcreate":
     size = sys.argv[4]
     rv = call(["/sbin/lvcreate", "-L", size + "M", "-n", lvname, vg])
     if rv != 0:
         print >>sys.stderr, "Error creating LV %s\n" %(lvname,)
         sys.exit(1)
     
-else if subcommand == "lvcreate-all":
-    from sipb_xen_database import *
-    import re
-    connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
-    for d in Disk.select():
-        check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-        machine = Machine.get(d.machine_id)
-        check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-        lvname = machine.name + "_" + d.guest_device_name
-        if not os.path.exists("/dev/%s/%s" % (vg, lvname)):
-            # LV doesn't exist
-            print >>sys.stderr, "Creating LV %s..." % (lvname,)
-            rv = call(["/sbin/lvcreate", "-L", str(d.size) + "M", "-n", lvname, vg])
-            if rv != 0:
-                print >>sys.stderr, "Error creating LV %s\n" %(lvname,)
-                sys.exit(1)