[Xen-changelog] [xen master] tools/xend: move assert to exception block

[patchbot@xxxxxxx]

commit 2256f09ee54136a399374c3d1b9a0c99df2fd66c
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Mon Feb 10 08:57:34 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Mar 27 15:05:16 2014 +0000

    tools/xend: move assert to exception block
    
    The two assert in restore trigger sometimes after hundreds of
    migrations. If they trigger the destination host will not destroy the
    newly created, yet empty guest. After a second migration attempt to this
    host there will be two guets with the same name and uuid. This situation
    is poorly handled by the xm tools.
    With this change the empty guest will be destroyed.
    
    Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Matt Wilson <msw@xxxxxxxxxx>
---
 tools/python/xen/xend/XendCheckpoint.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/python/xen/xend/XendCheckpoint.py 
b/tools/python/xen/xend/XendCheckpoint.py
index a433ffa..b8caf02 100644
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -249,9 +249,6 @@ def restore(xd, fd, dominfo = None, paused = False, 
relocating = False):
     store_port   = dominfo.getStorePort()
     console_port = dominfo.getConsolePort()
 
-    assert store_port
-    assert console_port
-
     # if hvm, pass mem size to calculate the store_mfn
     if is_hvm:
         apic = int(dominfo.info['platform'].get('apic', 0))
@@ -263,6 +260,9 @@ def restore(xd, fd, dominfo = None, paused = False, 
relocating = False):
         pae  = 0
 
     try:
+        assert store_port
+        assert console_port
+
         restore_image = image.create(dominfo, dominfo.info)
         memory = restore_image.getRequiredAvailableMemory(
             dominfo.info['memory_dynamic_max'] / 1024)
--
generated by git-patchbot for /home/xen/git/xen.git#master

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