External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Refactor qemuMigrationWaitForCompletion

Browse Source 
Checking status of all part of migration and aborting it when something
failed is a complex thing which makes the waiting loop hard to read.
This patch moves all the checks into a separate function similarly to
what was done for drive mirror loops.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-05-28 11:58:11 +02:00
parent 92b5bcccaa
commit d29c45587b
1 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/qemu/qemu_migration.c
View File

@ -2566,11 +2566,14 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
} }
/* Returns 0 on success, -2 when migration needs to be cancelled, or -1 when /**
* QEMU reports failed migration. * Returns 1 if migration completed successfully,
* 0 if the domain is still being migrated,
* -1 migration failed,
* -2 something else failed, we need to cancel migration.
*/ */
static int static int
qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, qemuMigrationCompleted(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob, qemuDomainAsyncJob asyncJob,
virConnectPtr dconn, virConnectPtr dconn,
@ -2580,22 +2583,13 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobInfoPtr jobInfo = priv->job.current; qemuDomainJobInfoPtr jobInfo = priv->job.current;
int pauseReason; int pauseReason;
int ret = -1;
jobInfo->type = VIR_DOMAIN_JOB_UNBOUNDED;
while (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) {
/* Poll every 50ms for progress & to allow cancellation */
struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull };
if (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0) if (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0)
goto error; goto error;
if (storage && if (storage && qemuMigrationDriveMirrorReady(driver, vm) < 0)
qemuMigrationDriveMirrorReady(driver, vm) < 0) goto error;
break;
/* cancel migration if disk I/O error is emitted while migrating */
if (abort_on_error && if (abort_on_error &&
virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED && virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED &&
pauseReason == VIR_DOMAIN_PAUSED_IOERROR) { pauseReason == VIR_DOMAIN_PAUSED_IOERROR) {
@ -2610,28 +2604,60 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
goto error; goto error;
} }
if (jobInfo->type == VIR_DOMAIN_JOB_COMPLETED)
return 1;
else
return 0;
error:
if (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) { if (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) {
/* The migration was aborted by us rather than QEMU itself. */
jobInfo->type = VIR_DOMAIN_JOB_FAILED;
return -2;
} else if (jobInfo->type == VIR_DOMAIN_JOB_COMPLETED) {
jobInfo->type = VIR_DOMAIN_JOB_FAILED;
return -1;
} else {
return -1;
}
}
/* Returns 0 on success, -2 when migration needs to be cancelled, or -1 when
* QEMU reports failed migration.
*/
static int
qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
virDomainObjPtr vm,
qemuDomainAsyncJob asyncJob,
virConnectPtr dconn,
bool abort_on_error,
bool storage)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobInfoPtr jobInfo = priv->job.current;
int rv;
jobInfo->type = VIR_DOMAIN_JOB_UNBOUNDED;
while ((rv = qemuMigrationCompleted(driver, vm, asyncJob, dconn,
abort_on_error, storage)) != 1) {
/* Poll every 50ms for progress & to allow cancellation */
struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull };
if (rv < 0)
return rv;
virObjectUnlock(vm); virObjectUnlock(vm);
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
virObjectLock(vm); virObjectLock(vm);
} }
}
qemuDomainJobInfoUpdateDowntime(jobInfo); qemuDomainJobInfoUpdateDowntime(jobInfo);
VIR_FREE(priv->job.completed); VIR_FREE(priv->job.completed);
if (VIR_ALLOC(priv->job.completed) == 0) if (VIR_ALLOC(priv->job.completed) == 0)
*priv->job.completed = *jobInfo; *priv->job.completed = *jobInfo;
return 0;
error: return 0;
/* Check if the migration was aborted by us rather than QEMU itself. */
if (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED ||
jobInfo->type == VIR_DOMAIN_JOB_COMPLETED) {
if (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED)
ret = -2;
jobInfo->type = VIR_DOMAIN_JOB_FAILED;
}
return ret;
} }