External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_migration: Properly wait for migration to be canceled

Browse Source 
In my commit v8.7.0-57-g2d7b22b561 I attempted to make
qemuMigrationSrcCancel synchronous, but failed. When we are canceling
migration after some kind of error which is detected in
in qemuMigrationSrcWaitForCompletion, jobData->status will be set to
VIR_DOMAIN_JOB_STATUS_FAILED regardless on QEMU state. So instead of
relying on the translated jobData->status in qemuMigrationSrcIsCanceled
we need to check the migration status we get from QEMU MIGRATION event.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2022-10-11 14:00:13 +02:00
parent e49313b54e
commit 4dd86f334b
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qemu/qemu_migration.c
View File

@ -4597,21 +4597,30 @@ static bool
qemuMigrationSrcIsCanceled(virDomainObj *vm) qemuMigrationSrcIsCanceled(virDomainObj *vm)
{ {
virDomainJobData *jobData = vm->job->current; virDomainJobData *jobData = vm->job->current;
qemuDomainJobDataPrivate *priv = jobData->privateData;
qemuMonitorMigrationStatus status = priv->stats.mig.status;
qemuMigrationUpdateJobType(jobData); switch (status) {
switch (jobData->status) { case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED:
case VIR_DOMAIN_JOB_STATUS_FAILED: case QEMU_MONITOR_MIGRATION_STATUS_ERROR:
case VIR_DOMAIN_JOB_STATUS_CANCELED: case QEMU_MONITOR_MIGRATION_STATUS_CANCELLED:
case VIR_DOMAIN_JOB_STATUS_COMPLETED: case QEMU_MONITOR_MIGRATION_STATUS_INACTIVE:
case VIR_DOMAIN_JOB_STATUS_NONE: VIR_DEBUG("QEMU migration status: %s; waiting finished",
qemuMonitorMigrationStatusTypeToString(status));
return true; return true;
case VIR_DOMAIN_JOB_STATUS_MIGRATING: case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY:
case VIR_DOMAIN_JOB_STATUS_POSTCOPY: case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_RECOVER:
case VIR_DOMAIN_JOB_STATUS_PAUSED: case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY_PAUSED:
case VIR_DOMAIN_JOB_STATUS_HYPERVISOR_COMPLETED: case QEMU_MONITOR_MIGRATION_STATUS_PRE_SWITCHOVER:
case VIR_DOMAIN_JOB_STATUS_POSTCOPY_PAUSED: case QEMU_MONITOR_MIGRATION_STATUS_DEVICE:
case VIR_DOMAIN_JOB_STATUS_ACTIVE: case QEMU_MONITOR_MIGRATION_STATUS_SETUP:
case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE:
case QEMU_MONITOR_MIGRATION_STATUS_CANCELLING:
case QEMU_MONITOR_MIGRATION_STATUS_WAIT_UNPLUG:
case QEMU_MONITOR_MIGRATION_STATUS_LAST:
VIR_DEBUG("QEMU migration status: %s; still waiting",
qemuMonitorMigrationStatusTypeToString(status));
break; break;
} }