f43e68d196
libvirt xen-4.4.0-testing-src.tar.bz2 - bnc#863297: xend/pvscsi: recognize also SCSI CDROM devices xend-pvscsi-recognize-also-SCSI-CDROM-devices.patch - fate#316614: set migration constraints from cmdline fix xl migrate to print the actual error string libxc-pass-errno-to-callers-of-xc_domain_save.patch - Include additional help docs for xl in xen-tools - Apply all patches including those for unpackaged xend xen.spec - fate#316614: set migration constraints from cmdline split existing changes into libxl and xend part added libxl.set-migration-constraints-from-cmdline.patch added xend-set-migration-constraints-from-cmdline.patch removed xen.migrate.tools_add_xm_migrate_--log_progress_option.patch removed xen.migrate.tools_set_number_of_dirty_pages_during_migration.patch removed xen.migrate.tools_set_migration_constraints_from_cmdline.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=299
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Thu Mar 28 15:36:02 2013 +0100
|
|
files: tools/python/xen/xend/XendCheckpoint.py
|
|
description:
|
|
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 <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/python/xen/xend/XendCheckpoint.py | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
Index: xen-4.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
===================================================================
|
|
--- xen-4.4.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
|
|
+++ xen-4.4.0-testing/tools/python/xen/xend/XendCheckpoint.py
|
|
@@ -267,9 +267,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))
|
|
@@ -281,6 +278,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)
|