External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Finish phase

Browse Source 
Everything was already done in the normal Finish phase and vCPUs are
running. We just need to wait for all remaining data to be transferred.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Jiri Denemark 2022-05-10 15:20:25 +02:00
parent 55e49b1b72
commit c1d40d2c40
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/qemu/qemu_migration.c
View File

@ -6565,6 +6565,22 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
} }
static int
qemuMigrationDstFinishResume(virQEMUDriver *driver,
virDomainObj *vm)
{
VIR_DEBUG("vm=%p", vm);
if (qemuMigrationDstWaitForCompletion(driver, vm,
VIR_ASYNC_JOB_MIGRATION_IN,
false) < 0) {
return -1;
}
return 0;
}
static virDomainPtr static virDomainPtr
qemuMigrationDstFinishActive(virQEMUDriver *driver, qemuMigrationDstFinishActive(virQEMUDriver *driver,
virConnectPtr dconn, virConnectPtr dconn,
@ -6587,7 +6603,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
qemuDomainJobPrivate *jobPriv = priv->job.privateData; qemuDomainJobPrivate *jobPriv = priv->job.privateData;
virObjectEvent *event; virObjectEvent *event;
bool inPostCopy = false; bool inPostCopy = false;
bool doKill = true; bool doKill = priv->job.phase != QEMU_MIGRATION_PHASE_FINISH_RESUME;
int rc; int rc;
VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d", VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d",
@ -6612,8 +6628,14 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
goto error; goto error;
} }
rc = qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto, if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
timeReceived, &doKill, &inPostCopy); rc = qemuMigrationDstFinishResume(driver, vm);
inPostCopy = true;
} else {
rc = qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto,
timeReceived, &doKill, &inPostCopy);
}
if (rc < 0 || if (rc < 0 ||
!(dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, vm->def->id))) !(dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, vm->def->id)))
goto error; goto error;
@ -6684,6 +6706,8 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
unsigned short port; unsigned short port;
unsigned long long timeReceived = 0; unsigned long long timeReceived = 0;
int phase = v3proto ? QEMU_MIGRATION_PHASE_FINISH3
: QEMU_MIGRATION_PHASE_FINISH2;
VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
"cookieout=%p, cookieoutlen=%p, flags=0x%lx, retcode=%d", "cookieout=%p, cookieoutlen=%p, flags=0x%lx, retcode=%d",
@ -6698,14 +6722,24 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
goto cleanup; goto cleanup;
} }
if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
if (!qemuMigrationAnyCanResume(vm, VIR_ASYNC_JOB_MIGRATION_IN, flags,
QEMU_MIGRATION_PHASE_PREPARE_RESUME))
goto cleanup;
phase = QEMU_MIGRATION_PHASE_FINISH_RESUME;
}
ignore_value(virTimeMillisNow(&timeReceived)); ignore_value(virTimeMillisNow(&timeReceived));
if (qemuMigrationJobStartPhase(vm, if (qemuMigrationJobStartPhase(vm, phase) < 0)
v3proto ? QEMU_MIGRATION_PHASE_FINISH3
: QEMU_MIGRATION_PHASE_FINISH2) < 0)
goto cleanup; goto cleanup;
qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
virCloseCallbacksUnset(driver->closeCallbacks, vm,
qemuMigrationAnyConnectionClosed);
qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
} else {
qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup);
}
g_clear_pointer(&priv->job.completed, virDomainJobDataFree); g_clear_pointer(&priv->job.completed, virDomainJobDataFree);
cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK |