[Xen-changelog] If domain destruction fails because the domain does not

[Xen patchbot -2.0-testing <patchbot-2.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b8347bea93247d0a15abb7000507ac3e6ef69a5f
# Parent  47dba41f4ff0b3642ca8147d19f3959386f88c50

If domain destruction fails because the domain does not
exist, that should nto be a fatal error within xend.
Just log a warning and carry on regardless. This fixes
the symptoms of a race condition during live relocation.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 47dba41f4ff0 -r b8347bea9324 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Fri Jul 15 07:38:11 2005
+++ b/tools/python/xen/xend/XendDomain.py       Fri Jul 15 07:58:10 2005
@@ -560,7 +560,11 @@
 
         @param id: domain id
         """
-        dominfo = self.domain_lookup(id)
+        try:
+            dominfo = self.domain_lookup(id)
+        except:
+            log.info('Attempt to destroy non-existent domain: %s', id)
+            return 0
         log.info('Destroying domain: name=%s', dominfo.name)
         eserver.inject('xend.domain.destroy', [dominfo.name, dominfo.id])
         if dominfo:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog