[libvirt PATCH v2 71/81] qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for peer-to-peer migration
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
---
Notes:
Version 2:
- no change
src/qemu/qemu_migration.c | 53 ++++++++++++++++++++++++++-------------
1 file changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 79766b502e..4bf942e6ab 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2726,7 +2726,7 @@ qemuMigrationAnyCanResume(virDomainObj *vm,
*/
if (job == VIR_ASYNC_JOB_MIGRATION_OUT &&
expectedPhase < QEMU_MIGRATION_PHASE_PERFORM_RESUME &&
- !(flags & VIR_MIGRATE_CHANGE_PROTECTION)) {
+ !(flags & (VIR_MIGRATE_CHANGE_PROTECTION | VIR_MIGRATE_PEER2PEER))) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("resuming failed post-copy migration requires change
protection"));
return false;
@@ -5429,9 +5429,14 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
* bit here, because we are already running inside the context of
* a single job. */
- dom_xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname,
- &cookieout, &cookieoutlen,
- nmigrate_disks, migrate_disks, flags);
+ if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
+ dom_xml = qemuMigrationSrcBeginResume(driver, vm, xmlin,
+ &cookieout, &cookieoutlen, flags);
+ } else {
+ dom_xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname,
+ &cookieout, &cookieoutlen,
+ nmigrate_disks, migrate_disks, flags);
+ }
if (!dom_xml)
goto cleanup;
@@ -5487,7 +5492,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
goto cleanup;
}
- if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED)
+ if (!(flags & VIR_MIGRATE_POSTCOPY_RESUME) &&
+ virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED)
flags |= VIR_MIGRATE_PAUSED;
destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR |
@@ -5936,22 +5942,35 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
qemuDomainObjPrivate *priv = vm->privateData;
qemuDomainJobPrivate *jobPriv = priv->job.privateData;
- if (qemuMigrationJobStart(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT,
- flags) < 0)
- goto cleanup;
+ if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
+ if (!qemuMigrationAnyCanResume(vm, VIR_ASYNC_JOB_MIGRATION_OUT, flags,
+ QEMU_MIGRATION_PHASE_POSTCOPY_FAILED))
+ goto cleanup;
- if (!(flags & VIR_MIGRATE_OFFLINE) && virDomainObjCheckActive(vm) <
0)
- goto endjob;
+ if (qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_BEGIN_RESUME) < 0)
+ goto cleanup;
- if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags))
- goto endjob;
+ virCloseCallbacksUnset(driver->closeCallbacks, vm,
+ qemuMigrationAnyConnectionClosed);
+ qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
+ } else {
+ if (qemuMigrationJobStart(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT,
+ flags) < 0)
+ goto cleanup;
- if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
- !qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps,
- nmigrate_disks, migrate_disks, flags))
- goto endjob;
+ if (!(flags & VIR_MIGRATE_OFFLINE) && virDomainObjCheckActive(vm)
< 0)
+ goto endjob;
- qemuMigrationSrcStoreDomainState(vm);
+ if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags))
+ goto endjob;
+
+ if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
+ !qemuMigrationSrcIsSafe(vm->def, priv->qemuCaps,
+ nmigrate_disks, migrate_disks, flags))
+ goto endjob;
+
+ qemuMigrationSrcStoreDomainState(vm);
+ }
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
ret = qemuMigrationSrcPerformPeer2Peer(driver, conn, vm, xmlin, persist_xml,
--
2.35.1