3:42 p.m.
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(a)redhat.com>
---
Notes:
ACKed in version 2
Version 3:
- no change
Version 2:
- new patch
src/qemu/qemu_migration.c | 106 +++++++++++++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 40 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 77a76a7..d9f1a59 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2540,6 +2540,63 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
}
+/**
+ * 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
+qemuMigrationCompleted(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ qemuDomainAsyncJob asyncJob,
+ virConnectPtr dconn,
+ bool abort_on_error,
+ bool storage)
+{
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ qemuDomainJobInfoPtr jobInfo = priv->job.current;
+ int pauseReason;
+
+ if (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0)
+ goto error;
+
+ if (storage && qemuMigrationDriveMirrorReady(driver, vm) < 0)
+ goto error;
+
+ if (abort_on_error &&
+ virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED &&
+ pauseReason == VIR_DOMAIN_PAUSED_IOERROR) {
+ virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"),
+ qemuMigrationJobName(vm), _("failed due to I/O
error"));
+ goto error;
+ }
+
+ if (dconn && virConnectIsAlive(dconn) <= 0) {
+ virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+ _("Lost connection to destination host"));
+ goto error;
+ }
+
+ if (jobInfo->type == VIR_DOMAIN_JOB_COMPLETED)
+ return 1;
+ else
+ return 0;
+
+ error:
+ 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.
*/
@@ -2553,59 +2610,28 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
{
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobInfoPtr jobInfo = priv->job.current;
- int pauseReason;
- int ret = -1;
+ int rv;
jobInfo->type = VIR_DOMAIN_JOB_UNBOUNDED;
-
- while (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 (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0)
- goto error;
+ if (rv < 0)
+ return rv;
- if (storage &&
- qemuMigrationDriveMirrorReady(driver, vm) < 0)
- break;
-
- /* cancel migration if disk I/O error is emitted while migrating */
- if (abort_on_error &&
- virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED &&
- pauseReason == VIR_DOMAIN_PAUSED_IOERROR) {
- virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"),
- qemuMigrationJobName(vm), _("failed due to I/O
error"));
- goto error;
- }
-
- if (dconn && virConnectIsAlive(dconn) <= 0) {
- virReportError(VIR_ERR_OPERATION_FAILED, "%s",
- _("Lost connection to destination host"));
- goto error;
- }
-
- if (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) {
- virObjectUnlock(vm);
- nanosleep(&ts, NULL);
- virObjectLock(vm);
- }
+ virObjectUnlock(vm);
+ nanosleep(&ts, NULL);
+ virObjectLock(vm);
}
qemuDomainJobInfoUpdateDowntime(jobInfo);
VIR_FREE(priv->job.completed);
if (VIR_ALLOC(priv->job.completed) == 0)
*priv->job.completed = *jobInfo;
- return 0;
- error:
- /* 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;
+ return 0;
}
--
2.4.3