Changeset 1066 for trunk

Timestamp:

Oct 5, 2008, 6:01:54 PM (16 years ago)

Author:

broder

Message:

Explicitly lock an LV before trying to delete it

Location:

trunk/packages/sipb-xen-remctl-auto

Files:

• debian/changelog (modified) (1 diff)
• files/usr/sbin/sipb-xen-lvm (modified) (1 diff)

trunk/packages/sipb-xen-remctl-auto/debian/changelog

@@ +1 @@
+sipb-xen-remctl-auto (1.1) unstable; urgency=low
+
+  * Explicitly lock a volume before deleting it
+
+ -- Evan Broder <broder@mit.edu>  Sun, 05 Oct 2008 18:01:34 -0400
+
 sipb-xen-remctl-auto (1.0.21) unstable; urgency=low
 

trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm

@@ -42 +42 @@
     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])
+    if rv != 0:
+        error()
     ensureoff(machine)
-    if rv != 0:
-        print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
-        sys.exit(1)
 elif subcommand == "lvresize":
     size = sys.argv[4]