From: Olaf Hering Subject: [PATCH 6 of 6] tools/xend: move assert to exception block Date: Mon, 18 Mar 2013 17:40:11 +0100 Message-ID: <07a436dc7cbd710f219f.1363624811@probook.site> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian.Campbell@citrix.com List-Id: xen-devel@lists.xenproject.org # HG changeset patch # User Olaf Hering # Date 1363624025 -3600 # Node ID 07a436dc7cbd710f219f9728704b5e8de8de0a39 # Parent 9e5bec95fd04a05d0b009adcc3f10f635ab638be 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, still 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 guest will be destroyed. Signed-off-by: Olaf Hering diff -r 9e5bec95fd04 -r 07a436dc7cbd tools/python/xen/xend/XendCheckpoint.py --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -262,9 +262,6 @@ def restore(xd, fd, dominfo = None, paus 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)) @@ -276,6 +273,9 @@ def restore(xd, fd, dominfo = None, paus 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)