From: Tim Abbott Date: Tue, 9 Oct 2007 19:42:04 +0000 (-0400) Subject: Make lvcreate-all work. X-Git-Tag: sipb-xen-remctl-auto/1.0.4~3 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/45977052c371d46988b00c89cda3813239c753e7 Make lvcreate-all work. svn path=/trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/; revision=156 --- diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm index 304e08d..2a3fade 100755 --- a/files/usr/sbin/sipb-xen-lvm +++ b/files/usr/sbin/sipb-xen-lvm @@ -12,15 +12,32 @@ 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]) +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 = 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) @@ -50,20 +67,4 @@ elif subcommand == "lvcreate": print >>sys.stderr, "Error creating LV %s\n" %(lvname,) sys.exit(1) -elif 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 = 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)