Paolo Bonzini wrote: Pushed, thanks. -- Chris Lalancette

This adds a new flag, VIR_MIGRATE_PAUSED, that mandates pausing the migrated VM before starting it. * include/libvirt/libvirt.h.in (virDomainMigrateFlags): Add VIR_MIGRATE_PAUSED. * src/libvirt.c (virDomainMigrateVersion2): "Optimize" combination of VIR_MIGRATE_LIVE and VIR_MIGRATE_PAUSED. * src/qemu/qemu_driver.c (qemudDomainMigrateFinish2): Handle VIR_MIGRATE_PAUSED. * tools/virsh.c (opts_migrate): Add --suspend. (cmdMigrate): Handle it. * tools/virsh.pod (migrate): Document it. * docs/libvirt-api.xml: Regenerate. * docs/libvirt-refs.xml: Regenerate. --- I'm including regenerated files to aid whoever commits the patch. docs/libvirt-api.xml | 9 ++++++--- docs/libvirt-refs.xml | 14 ++++++++++++++ include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 9 ++++++++- src/qemu/qemu_driver.c | 28 ++++++++++++++++++---------- tools/virsh.c | 4 ++++ tools/virsh.pod | 7 ++++--- 7 files changed, 55 insertions(+), 17 deletions(-) diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 88dc246..f93980b 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -47,6 +47,7 @@ <exports symbol='VIR_MIGRATE_LIVE' type='enum'/> <exports symbol='VIR_DOMAIN_EVENT_STOPPED_DESTROYED' type='enum'/> <exports symbol='VIR_DOMAIN_EVENT_DEFINED_ADDED' type='enum'/> + <exports symbol='VIR_STORAGE_POOL_DELETE_NORMAL' type='enum'/> <exports symbol='VIR_SECRET_USAGE_TYPE_NONE' type='enum'/> <exports symbol='VIR_DOMAIN_EVENT_STARTED_MIGRATED' type='enum'/> <exports symbol='VIR_STREAM_EVENT_HANGUP' type='enum'/> @@ -63,7 +64,7 @@ <exports symbol='VIR_EVENT_HANDLE_WRITABLE' type='enum'/> <exports symbol='VIR_STORAGE_POOL_BUILD_NEW' type='enum'/> <exports symbol='VIR_DOMAIN_EVENT_SUSPENDED_PAUSED' type='enum'/> - <exports symbol='VIR_STORAGE_POOL_DELETE_NORMAL' type='enum'/> + <exports symbol='VIR_MIGRATE_PAUSED' type='enum'/> <exports symbol='VIR_MEMORY_PHYSICAL' type='enum'/> <exports symbol='VIR_DOMAIN_SCHED_FIELD_INT' type='enum'/> <exports symbol='VIR_DOMAIN_SCHED_FIELD_ULLONG' type='enum'/> @@ -718,7 +719,8 @@ <enum name='VIR_FROM_XML' file='virterror' value='5' type='virErrorDomain' info='Error in the XML code'/> <enum name='VIR_MEMORY_PHYSICAL' file='libvirt' value='2' type='virDomainMemoryFlags' info=' addresses are physical addresses'/> <enum name='VIR_MEMORY_VIRTUAL' file='libvirt' value='1' type='virDomainMemoryFlags' info='addresses are virtual addresses'/> - <enum name='VIR_MIGRATE_LIVE' file='libvirt' value='1' type='virDomainMigrateFlags' info=' live migration'/> + <enum name='VIR_MIGRATE_LIVE' file='libvirt' value='1' type='virDomainMigrateFlags' info='live migration'/> + <enum name='VIR_MIGRATE_PAUSED' file='libvirt' value='2' type='virDomainMigrateFlags' info=' pause on remote side'/> <enum name='VIR_SECRET_USAGE_TYPE_NONE' file='libvirt' value='0' type='virSecretUsageType'/> <enum name='VIR_SECRET_USAGE_TYPE_VOLUME' file='libvirt' value='1' type='virSecretUsageType' info=' Expect more owner types later...'/> <enum name='VIR_STORAGE_POOL_BUILDING' file='libvirt' value='1' type='virStoragePoolState' info='Initializing pool, not available'/> @@ -1595,7 +1597,8 @@ connection you should split large requests to <= 65536 bytes.]]></info> host given by dconn (a connection to the destination host). Flags may be one of more of the following: - VIR_MIGRATE_LIVE Attempt a live migration. + VIR_MIGRATE_LIVE Attempt a live migration. + VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. If a hypervisor supports renaming domains during migration, then you may set the dname parameter to the new name (otherwise diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index 08034e4..b72ecf2 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -154,6 +154,7 @@ <reference name='VIR_MEMORY_PHYSICAL' href='html/libvirt-libvirt.html#VIR_MEMORY_PHYSICAL'/> <reference name='VIR_MEMORY_VIRTUAL' href='html/libvirt-libvirt.html#VIR_MEMORY_VIRTUAL'/> <reference name='VIR_MIGRATE_LIVE' href='html/libvirt-libvirt.html#VIR_MIGRATE_LIVE'/> + <reference name='VIR_MIGRATE_PAUSED' href='html/libvirt-libvirt.html#VIR_MIGRATE_PAUSED'/> <reference name='VIR_NODEINFO_MAXCPUS' href='html/libvirt-libvirt.html#VIR_NODEINFO_MAXCPUS'/> <reference name='VIR_SECRET_USAGE_TYPE_NONE' href='html/libvirt-libvirt.html#VIR_SECRET_USAGE_TYPE_NONE'/> <reference name='VIR_SECRET_USAGE_TYPE_VOLUME' href='html/libvirt-libvirt.html#VIR_SECRET_USAGE_TYPE_VOLUME'/> @@ -659,6 +660,7 @@ <ref name='VIR_MEMORY_PHYSICAL'/> <ref name='VIR_MEMORY_VIRTUAL'/> <ref name='VIR_MIGRATE_LIVE'/> + <ref name='VIR_MIGRATE_PAUSED'/> <ref name='VIR_NODEINFO_MAXCPUS'/> <ref name='VIR_SECRET_USAGE_TYPE_NONE'/> <ref name='VIR_SECRET_USAGE_TYPE_VOLUME'/> @@ -1596,6 +1598,7 @@ <ref name='VIR_MEMORY_PHYSICAL'/> <ref name='VIR_MEMORY_VIRTUAL'/> <ref name='VIR_MIGRATE_LIVE'/> + <ref name='VIR_MIGRATE_PAUSED'/> <ref name='VIR_NODEINFO_MAXCPUS'/> <ref name='VIR_SECRET_USAGE_TYPE_NONE'/> <ref name='VIR_SECRET_USAGE_TYPE_VOLUME'/> @@ -2463,6 +2466,9 @@ <word name='Launch'> <ref name='virDomainCreateXML'/> </word> + <word name='Leave'> + <ref name='virDomainMigrate'/> + </word> <word name='Length'> <ref name='_virConnectCredential'/> </word> @@ -2912,6 +2918,9 @@ <word name='VIR_MIGRATE_LIVE'> <ref name='virDomainMigrate'/> </word> + <word name='VIR_MIGRATE_PAUSED'> + <ref name='virDomainMigrate'/> + </word> <word name='VIR_SECRET_USAGE_TYPE_VOLUME'> <ref name='virSecretGetUsageID'/> </word> @@ -6569,6 +6578,7 @@ <ref name='virDomainBlockPeek'/> <ref name='virDomainCoreDump'/> <ref name='virDomainMemoryPeek'/> + <ref name='virDomainMigrate'/> <ref name='virStoragePoolRefresh'/> </word> <word name='remove'> @@ -6954,6 +6964,9 @@ <ref name='virDomainDestroy'/> <ref name='virNetworkDestroy'/> </word> + <word name='side'> + <ref name='virDomainMigrate'/> + </word> <word name='significant'> <ref name='virDomainPinVcpu'/> </word> @@ -7239,6 +7252,7 @@ <ref name='virDomainSave'/> </word> <word name='suspended'> + <ref name='virDomainMigrate'/> <ref name='virDomainResume'/> </word> <word name='synchronization'> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 4e63e48..0bc0c06 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -337,6 +337,7 @@ typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr; /* Domain migration flags. */ typedef enum { VIR_MIGRATE_LIVE = 1, /* live migration */ + VIR_MIGRATE_PAUSED = 2, /* pause on remote side */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/libvirt.c b/src/libvirt.c index dacf8c4..8569fcb 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3057,7 +3057,8 @@ virDomainMigrateVersion2 (virDomainPtr domain, * host given by dconn (a connection to the destination host). * * Flags may be one of more of the following: - * VIR_MIGRATE_LIVE Attempt a live migration. + * VIR_MIGRATE_LIVE Attempt a live migration. + * VIR_MIGRATE_PAUSED Leave the domain suspended on the remote side. * * If a hypervisor supports renaming domains during migration, * then you may set the dname parameter to the new name (otherwise @@ -3106,6 +3107,12 @@ virDomainMigrate (virDomainPtr domain, virResetLastError(); + if ((flags & VIR_MIGRATE_PAUSED)) { + /* Not doing migration live in this case reduces traffic, + and the effect is not visible. */ + flags &= ~VIR_MIGRATE_LIVE; + } + /* First checkout the source */ if (!VIR_IS_CONNECTED_DOMAIN (domain)) { virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3d5ef92..d0b2942 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6131,21 +6131,29 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, if (retcode == 0) { dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); - /* run 'cont' on the destination, which allows migration on qemu - * >= 0.10.6 to work properly. This isn't strictly necessary on - * older qemu's, but it also doesn't hurt anything there - */ - if (qemuMonitorStartCPUs(dconn, vm) < 0) { - if (virGetLastError() == NULL) - qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("resume operation failed")); - goto cleanup; + if (!(flags & VIR_MIGRATE_PAUSED)) { + /* run 'cont' on the destination, which allows migration on qemu + * >= 0.10.6 to work properly. This isn't strictly necessary on + * older qemu's, but it also doesn't hurt anything there + */ + if (qemuMonitorStartCPUs(dconn, vm) < 0) { + if (virGetLastError() == NULL) + qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("resume operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_RUNNING; } - vm->state = VIR_DOMAIN_RUNNING; event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + if (vm->state == VIR_DOMAIN_PAUSED) { + qemuDomainEventQueue(driver, event); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } virDomainSaveStatus(dconn, driver->stateDir, vm); } else { qemudShutdownVMDaemon (dconn, driver, vm); diff --git a/tools/virsh.c b/tools/virsh.c index 3482389..307807e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2462,6 +2462,7 @@ static const vshCmdInfo info_migrate[] = { static const vshCmdOptDef opts_migrate[] = { {"live", VSH_OT_BOOL, 0, gettext_noop("live migration")}, + {"suspend", VSH_OT_BOOL, 0, gettext_noop("do not restart the domain on the destination host")}, {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("connection URI of the destination host")}, {"migrateuri", VSH_OT_DATA, 0, gettext_noop("migration URI, usually can be omitted")}, @@ -2499,6 +2500,9 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "live")) flags |= VIR_MIGRATE_LIVE; + if (vshCommandOptBool (cmd, "suspend")) + flags |= VIR_MIGRATE_PAUSED; + /* Temporarily connect to the destination host. */ dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); if (!dconn) goto done; diff --git a/tools/virsh.pod b/tools/virsh.pod index 55ec64a..34c9b34 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -303,10 +303,11 @@ except that it does some error checking. The editor used can be supplied by the C<$EDITOR> environment variable, or if that is not defined defaults to C<vi>. -=item B<migrate> optional I<--live> I<domain-id> I<desturi> I<migrateuri> +=item B<migrate> optional I<--live> I<--suspend> I<domain-id> I<desturi> I<migrateuri> -Migrate domain to another host. Add --live for live migration. The I<desturi> -is the connection URI of the destination host, and I<migrateuri> is the +Migrate domain to another host. Add --live for live migration; --suspend +leaves the domain paused on the destination host. The I<desturi> is the +connection URI of the destination host, and I<migrateuri> is the migration URI, which usually can be omitted. =item B<reboot> I<domain-id> -- 1.6.2.5

A return code of say 1 from Perform is currently considered an error, but it could also be passed simply to Finish. This makes the v2 protocol much more powerful. * src/remote/remote_protocol.x (remote_domain_migrate_perform_ret): New. * src/qemu/qemu_driver.c (qemudDomainMigrateFinish2): Succeed if qemudDomainMigratePerform returned a non-zero but positive value. * daemon/remote.c (remoteDispatchDomainMigratePerform): Adjust for remote_domain_migrate_perform_ret. * daemon/remote_dispatch_prototypes.h: Regenerate. * daemon/remote_dispatch_ret.h: Regenerate. * daemon/remote_dispatch_table.h: Regenerate. * src/remote/remote_driver.c (remoteDomainMigratePerform): Adjust for remote_domain_migrate_perform_ret. * src/remote/remote_protocol.c: Regenerate. * src/remote/remote_protocol.h: Regenerate. --- I'm including regenerated files to aid whoever commits the patch. daemon/remote.c | 3 ++- daemon/remote_dispatch_prototypes.h | 2 +- daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 6 ++++-- src/remote/remote_protocol.c | 11 ++++++++++- src/remote/remote_protocol.h | 7 +++++++ src/remote/remote_protocol.x | 4 ++++ 9 files changed, 31 insertions(+), 7 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index ba97379..67e85a4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1364,7 +1364,7 @@ remoteDispatchDomainMigratePerform (struct qemud_server *server ATTRIBUTE_UNUSED remote_message_header *hdr ATTRIBUTE_UNUSED, remote_error *rerr, remote_domain_migrate_perform_args *args, - void *ret ATTRIBUTE_UNUSED) + remote_domain_migrate_perform_ret *ret) { int r; virDomainPtr dom; @@ -1389,6 +1389,7 @@ remoteDispatchDomainMigratePerform (struct qemud_server *server ATTRIBUTE_UNUSED return -1; } + ret->code = r; return 0; } diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h index 16e8bb0..ba22df5 100644 --- a/daemon/remote_dispatch_prototypes.h +++ b/daemon/remote_dispatch_prototypes.h @@ -281,7 +281,7 @@ static int remoteDispatchDomainMigratePerform( remote_message_header *hdr, remote_error *err, remote_domain_migrate_perform_args *args, - void *ret); + remote_domain_migrate_perform_ret *ret); static int remoteDispatchDomainMigratePrepare( struct qemud_server *server, struct qemud_client *client, diff --git a/daemon/remote_dispatch_ret.h b/daemon/remote_dispatch_ret.h index 6ced13a..8c37917 100644 --- a/daemon/remote_dispatch_ret.h +++ b/daemon/remote_dispatch_ret.h @@ -39,6 +39,7 @@ remote_get_hostname_ret val_remote_get_hostname_ret; remote_supports_feature_ret val_remote_supports_feature_ret; remote_domain_migrate_prepare_ret val_remote_domain_migrate_prepare_ret; + remote_domain_migrate_perform_ret val_remote_domain_migrate_perform_ret; remote_domain_migrate_finish_ret val_remote_domain_migrate_finish_ret; remote_domain_block_stats_ret val_remote_domain_block_stats_ret; remote_domain_interface_stats_ret val_remote_domain_interface_stats_ret; diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h index 6b5df80..d2e66d4 100644 --- a/daemon/remote_dispatch_table.h +++ b/daemon/remote_dispatch_table.h @@ -315,7 +315,7 @@ { /* DomainMigratePerform => 62 */ .fn = (dispatch_fn) remoteDispatchDomainMigratePerform, .args_filter = (xdrproc_t) xdr_remote_domain_migrate_perform_args, - .ret_filter = (xdrproc_t) xdr_void, + .ret_filter = (xdrproc_t) xdr_remote_domain_migrate_perform_ret, }, { /* DomainMigrateFinish => 63 */ .fn = (dispatch_fn) remoteDispatchDomainMigrateFinish, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d0b2942..d2429de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6128,7 +6128,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn, /* Did the migration go as planned? If yes, return the domain * object, but if no, clean up the empty qemu process. */ - if (retcode == 0) { + if (retcode >= 0) { dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); if (!(flags & VIR_MIGRATE_PAUSED)) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 731b213..5ad833b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2577,6 +2577,7 @@ remoteDomainMigratePerform (virDomainPtr domain, { int rv = -1; remote_domain_migrate_perform_args args; + remote_domain_migrate_perform_ret ret; struct private_data *priv = domain->conn->privateData; remoteDriverLock(priv); @@ -2589,12 +2590,13 @@ remoteDomainMigratePerform (virDomainPtr domain, args.dname = dname == NULL ? NULL : (char **) &dname; args.resource = resource; + memset (&ret, 0, sizeof (ret)); if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PERFORM, (xdrproc_t) xdr_remote_domain_migrate_perform_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + (xdrproc_t) xdr_remote_domain_migrate_perform_ret, (char *) &ret) == -1) goto done; - rv = 0; + rv = ret.code; done: remoteDriverUnlock(priv); diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c index 1d2d242..0fab007 100644 --- a/src/remote/remote_protocol.c +++ b/src/remote/remote_protocol.c @@ -4,7 +4,7 @@ * It was generated using rpcgen. */ -#include "remote_protocol.h" +#include "./remote/remote_protocol.h" #include "internal.h" #include <arpa/inet.h> @@ -974,6 +974,15 @@ xdr_remote_domain_migrate_perform_args (XDR *xdrs, remote_domain_migrate_perform } bool_t +xdr_remote_domain_migrate_perform_ret (XDR *xdrs, remote_domain_migrate_perform_ret *objp) +{ + + if (!xdr_int (xdrs, &objp->code)) + return FALSE; + return TRUE; +} + +bool_t xdr_remote_domain_migrate_finish_args (XDR *xdrs, remote_domain_migrate_finish_args *objp) { char **objp_cpp0 = (char **) (void *) &objp->cookie.cookie_val; diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h index 64da9fa..85fb491 100644 --- a/src/remote/remote_protocol.h +++ b/src/remote/remote_protocol.h @@ -525,6 +525,11 @@ struct remote_domain_migrate_perform_args { }; typedef struct remote_domain_migrate_perform_args remote_domain_migrate_perform_args; +struct remote_domain_migrate_perform_ret { + int code; +}; +typedef struct remote_domain_migrate_perform_ret remote_domain_migrate_perform_ret; + struct remote_domain_migrate_finish_args { remote_nonnull_string dname; struct { @@ -1790,6 +1795,7 @@ extern bool_t xdr_remote_domain_dump_xml_ret (XDR *, remote_domain_dump_xml_ret extern bool_t xdr_remote_domain_migrate_prepare_args (XDR *, remote_domain_migrate_prepare_args*); extern bool_t xdr_remote_domain_migrate_prepare_ret (XDR *, remote_domain_migrate_prepare_ret*); extern bool_t xdr_remote_domain_migrate_perform_args (XDR *, remote_domain_migrate_perform_args*); +extern bool_t xdr_remote_domain_migrate_perform_ret (XDR *, remote_domain_migrate_perform_ret*); extern bool_t xdr_remote_domain_migrate_finish_args (XDR *, remote_domain_migrate_finish_args*); extern bool_t xdr_remote_domain_migrate_finish_ret (XDR *, remote_domain_migrate_finish_ret*); extern bool_t xdr_remote_domain_migrate_prepare2_args (XDR *, remote_domain_migrate_prepare2_args*); @@ -2044,6 +2050,7 @@ extern bool_t xdr_remote_domain_dump_xml_ret (); extern bool_t xdr_remote_domain_migrate_prepare_args (); extern bool_t xdr_remote_domain_migrate_prepare_ret (); extern bool_t xdr_remote_domain_migrate_perform_args (); +extern bool_t xdr_remote_domain_migrate_perform_ret (); extern bool_t xdr_remote_domain_migrate_finish_args (); extern bool_t xdr_remote_domain_migrate_finish_ret (); extern bool_t xdr_remote_domain_migrate_prepare2_args (); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 6b0a784..3c7873e 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -573,6 +573,10 @@ struct remote_domain_migrate_perform_args { unsigned hyper resource; }; +struct remote_domain_migrate_perform_ret { + int code; +}; + struct remote_domain_migrate_finish_args { remote_nonnull_string dname; opaque cookie<REMOTE_MIGRATE_COOKIE_MAX>; -- 1.6.2.5

On Thu, Oct 01, 2009 at 08:18:33PM +0200, Paolo Bonzini wrote: NACK ! an error in migration should not result in a dead daemon assert/exit forbidden even in error handling paths. -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/