tools/xend: move assert to exception block
PATCH 1/1 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.
---
This is a resend of an old patch, which never made it into the tree:
http://lists.xenproject.org/archives/html/xen-devel/2013-03/msg02550.html
tools/python/xen/xend/XendCheckpoint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/python/xen/xend/XendCheckpoint.py +3 -3
@@ -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)
Quoted 9 lines · Olaf Hering
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 <[email protected]>Acked-by Ian Jackson <[email protected]>
Quoted 38 lines
---
This is a resend of an old patch, which never made it into the tree:
http://lists.xenproject.org/archives/html/xen-devel/2013-03/msg02550.html
tools/python/xen/xend/XendCheckpoint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)tools/python/xen/xend/XendCheckpoint.py +3
-3@@ -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)_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Ian Campbell
AppliedQuoted 8 lines · Matt Wilson
Quoted 7 lines · Olaf Hering
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.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Olaf Hering <[email protected]>Acked-by Ian Jackson <[email protected]>Acked-by Matt Wilson <[email protected]>
Applied.