rpms/python-virtinst/devel virtinst-incremental-sleep.patch, NONE, 1.1 virtinst-invalid-mem-crash.patch, NONE, 1.1 python-virtinst.spec, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

Author: berrange

Update of /cvs/dist/rpms/python-virtinst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5904

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-incremental-sleep.patch 
	virtinst-invalid-mem-crash.patch 
Log Message:
Pull in two latest fixes from RHEL-5 branch

virtinst-incremental-sleep.patch:
 XenGuest.py |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

--- NEW FILE virtinst-incremental-sleep.patch ---
changeset:   71:9e34ad1488a19a4d17b012628c0eb02627dc6b0d
user:        "Jeremy Katz <katzj at redhat.com>"
date:        Fri Dec 01 16:44:55 2006 -0500
files:       virtinst/XenGuest.py
description:
don't sleep for 2 seconds unconditionally; just wait for the domain
to be up (#212024)


diff -r 263d871aae536801968105c60b9f1400d1104e3c -r 9e34ad1488a19a4d17b012628c0eb02627dc6b0d virtinst/XenGuest.py
--- a/virtinst/XenGuest.py	Thu Nov 30 10:47:22 2006 -0500
+++ b/virtinst/XenGuest.py	Fri Dec 01 16:44:55 2006 -0500
@@ -371,15 +371,22 @@ class XenGuest(object):
         if consolecb:
             child = consolecb(self.domain)
 
-        time.sleep(2)
-        # FIXME: if the domain doesn't exist now, it almost certainly crashed.
-        # it'd be nice to know that for certain...
-        try:
-            d = self.conn.lookupByName(self.name)
-        except libvirt.libvirtError:
+        # sleep in .25 second increments until either a) we find
+        # our domain or b) it's been 5 seconds.  this is so that
+        # we can try to gracefully handle domain creation failures
+        num = 0
+        d = None
+        while num < (5 / .25): # 5 seconds, .25 second sleeps
+            try:
+                d = self.conn.lookupByName(self.name)
+                break
+            except libvirt.libvirtError:
+                pass
+            time.sleep(0.25)
+
+        if d is None:
             raise RuntimeError, "It appears that your installation has crashed.  You should be able to find more information in the xen logs"
         
-
         cf = "/etc/xen/%s" %(self.name,)
         f = open(cf, "w+")
         xmc = self._get_config_xen()
@@ -395,7 +402,8 @@ class XenGuest(object):
 
         # ensure there's time for the domain to finish destroying if the
         # install has finished or the guest crashed
-        time.sleep(1)
+        if consolecb:
+            time.sleep(1)
         try:
             d = self.conn.lookupByName(self.name)
             return d



virtinst-invalid-mem-crash.patch:
 virt-install |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE virtinst-invalid-mem-crash.patch ---
changeset:   72:1e5769665e58839634796bfa812232814adb794a
user:        gcosta at redhat.com
date:        Tue Dec 12 13:05:51 2006 -0500
files:       virt-install
description:
Added exception instance to get_memory() exception

stoping virt-install to crash when a wrong parameter is
passed.


diff -r 9e34ad1488a19a4d17b012628c0eb02627dc6b0d -r 1e5769665e58839634796bfa812232814adb794a virt-install
--- a/virt-install	Fri Dec 01 16:44:55 2006 -0500
+++ b/virt-install	Tue Dec 12 13:05:51 2006 -0500
@@ -76,7 +76,7 @@ def get_memory(memory, guest):
         try:
             guest.memory = int(memory)
             break
-        except ValueError:
+        except ValueError, e:
             print "ERROR: ", e
             memory = None
 




Index: python-virtinst.spec
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-virtinst.spec	7 Dec 2006 19:46:52 -0000	1.7
+++ python-virtinst.spec	19 Dec 2006 20:24:06 -0000	1.8
@@ -3,8 +3,10 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-virtinst
 Version: 0.98.0
-Release: 2
+Release: 3%{?dist}
 Source0: virtinst-%{version}.tar.gz
+Patch1: virtinst-invalid-mem-crash.patch
+Patch2: virtinst-incremental-sleep.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +31,8 @@
 
 %prep
 %setup -q -n virtinst-%{version} 
+%patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -50,6 +54,10 @@
 %{_sbindir}/virt-install
 
 %changelog
+* Tue Dec 18 2006 Daniel P. Berrange <berrange at redhat.com> - 0.98.0-3.fc7
+- don't traceback on invalid memory param (gcosta, #219270)
+- let the console come back quicker to help with HVM installs (#212024)
+
 * Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 0.98.0-2
 - rebuild for python 2.5