Fix errors on lvresize to equal or smaller value.

svn path=/trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/; revision=175

diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm
index 183e54b..731b56c 100755 (executable)
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -2,7 +2,7 @@
 
 import sys
 import os.path
 
 import sys
 import os.path

-from subprocess import call, PIPE
+from subprocess import call, PIPE, Popen

 
 def check(b):
     if not b:
 
 def check(b):
     if not b:

@@ -15,7 +15,8 @@ subcommand = sys.argv[1]
 
 def ensureoff(machine):
     # Make sure the machine is off, but we don't care about errors if it is already off.
 
 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], stderr=PIPE)
+    rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
+              stderr=PIPE)

 
 if subcommand == "lvcreate-all":
     from sipb_xen_database import *
 
 if subcommand == "lvcreate-all":
     from sipb_xen_database import *

@@ -47,10 +48,15 @@ if subcommand == "lvremove":
 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
 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)
         sys.exit(1)

+    print >> sys.stderr, err

 elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk
 elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk