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: Make qemuMigrationCheckPhase failure fatal

Browse Source 
The check can reveal a serious bug in our migration code and we should
not silently ignore it.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Jiri Denemark 2022-05-10 15:20:25 +02:00
parent a5dc9bf96b
commit 69d9f54c66
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/qemu/qemu_migration.c
View File

@ -147,7 +147,8 @@ qemuMigrationCheckPhase(virDomainObj *vm,
if (phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && if (phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED &&
phase < priv->job.phase) { phase < priv->job.phase) {
VIR_ERROR(_("migration protocol going backwards %s => %s"), virReportError(VIR_ERR_INTERNAL_ERROR,
_("migration protocol going backwards %s => %s"),
qemuMigrationJobPhaseTypeToString(priv->job.phase), qemuMigrationJobPhaseTypeToString(priv->job.phase),
qemuMigrationJobPhaseTypeToString(phase)); qemuMigrationJobPhaseTypeToString(phase));
return -1; return -1;
@ -157,22 +158,23 @@ qemuMigrationCheckPhase(virDomainObj *vm,
} }
static void ATTRIBUTE_NONNULL(1) static int G_GNUC_WARN_UNUSED_RESULT
qemuMigrationJobSetPhase(virDomainObj *vm, qemuMigrationJobSetPhase(virDomainObj *vm,
qemuMigrationJobPhase phase) qemuMigrationJobPhase phase)
{ {
if (qemuMigrationCheckPhase(vm, phase) < 0) if (qemuMigrationCheckPhase(vm, phase) < 0)
return; return -1;
qemuDomainObjSetJobPhase(vm, phase); qemuDomainObjSetJobPhase(vm, phase);
return 0;
} }
static void ATTRIBUTE_NONNULL(1) static int G_GNUC_WARN_UNUSED_RESULT
qemuMigrationJobStartPhase(virDomainObj *vm, qemuMigrationJobStartPhase(virDomainObj *vm,
qemuMigrationJobPhase phase) qemuMigrationJobPhase phase)
{ {
qemuMigrationJobSetPhase(vm, phase); return qemuMigrationJobSetPhase(vm, phase);
} }
@ -2567,8 +2569,9 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
* Otherwise we will start the async job later in the perform phase losing * Otherwise we will start the async job later in the perform phase losing
* change protection. * change protection.
*/ */
if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) if (priv->job.asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT &&
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3); qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3) < 0)
return NULL;
if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags))
return NULL; return NULL;
@ -3117,7 +3120,9 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
if (qemuMigrationJobStart(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, if (qemuMigrationJobStart(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN,
flags) < 0) flags) < 0)
goto cleanup; goto cleanup;
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PREPARE);
if (qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PREPARE) < 0)
goto stopjob;
/* Domain starts inactive, even if the domain XML had an id field. */ /* Domain starts inactive, even if the domain XML had an id field. */
vm->def->id = -1; vm->def->id = -1;
@ -3637,7 +3642,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver,
else else
phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED; phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED;
qemuMigrationJobSetPhase(vm, phase); if (qemuMigrationJobSetPhase(vm, phase) < 0)
return -1;
if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv,
cookiein, cookieinlen, cookiein, cookieinlen,
@ -3722,7 +3728,9 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver,
else else
phase = QEMU_MIGRATION_PHASE_CONFIRM3; phase = QEMU_MIGRATION_PHASE_CONFIRM3;
qemuMigrationJobStartPhase(vm, phase); if (qemuMigrationJobStartPhase(vm, phase) < 0)
goto cleanup;
virCloseCallbacksUnset(driver->closeCallbacks, vm, virCloseCallbacksUnset(driver->closeCallbacks, vm,
qemuMigrationSrcCleanup); qemuMigrationSrcCleanup);
qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob); qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
@ -4885,7 +4893,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
* until the migration is complete. * until the migration is complete.
*/ */
VIR_DEBUG("Perform %p", sconn); VIR_DEBUG("Perform %p", sconn);
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2); ignore_value(qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2));
if (flags & VIR_MIGRATE_TUNNELLED) if (flags & VIR_MIGRATE_TUNNELLED)
ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL,
NULL, 0, NULL, NULL, NULL, 0, NULL, NULL,
@ -5129,7 +5137,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
* confirm migration completion. * confirm migration completion.
*/ */
VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri)); VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri));
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3); ignore_value(qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3));
VIR_FREE(cookiein); VIR_FREE(cookiein);
cookiein = g_steal_pointer(&cookieout); cookiein = g_steal_pointer(&cookieout);
cookieinlen = cookieoutlen; cookieinlen = cookieoutlen;
@ -5154,7 +5162,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
if (ret < 0) { if (ret < 0) {
virErrorPreserveLast(&orig_err); virErrorPreserveLast(&orig_err);
} else { } else {
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); ignore_value(qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE));
} }
/* If Perform returns < 0, then we need to cancel the VM /* If Perform returns < 0, then we need to cancel the VM
@ -5530,7 +5538,9 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
migParams, flags, dname, resource, migParams, flags, dname, resource,
&v3proto); &v3proto);
} else { } else {
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2); if (qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2) < 0)
goto endjob;
ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen,
cookieout, cookieoutlen, cookieout, cookieoutlen,
flags, resource, NULL, NULL, 0, NULL, flags, resource, NULL, NULL, 0, NULL,
@ -5622,7 +5632,9 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
return ret; return ret;
} }
qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3); if (qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3) < 0)
goto endjob;
virCloseCallbacksUnset(driver->closeCallbacks, vm, virCloseCallbacksUnset(driver->closeCallbacks, vm,
qemuMigrationSrcCleanup); qemuMigrationSrcCleanup);
@ -5636,7 +5648,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
goto endjob; goto endjob;
} }
qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); ignore_value(qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE));
if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
qemuMigrationSrcCleanup) < 0) qemuMigrationSrcCleanup) < 0)
@ -6203,9 +6215,10 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
ignore_value(virTimeMillisNow(&timeReceived)); ignore_value(virTimeMillisNow(&timeReceived));
qemuMigrationJobStartPhase(vm, if (qemuMigrationJobStartPhase(vm,
v3proto ? QEMU_MIGRATION_PHASE_FINISH3 v3proto ? QEMU_MIGRATION_PHASE_FINISH3
: QEMU_MIGRATION_PHASE_FINISH2); : QEMU_MIGRATION_PHASE_FINISH2) < 0)
goto cleanup;
qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup);
g_clear_pointer(&priv->job.completed, virDomainJobDataFree); g_clear_pointer(&priv->job.completed, virDomainJobDataFree);
@ -6277,7 +6290,8 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver,
else else
phase = QEMU_MIGRATION_PHASE_CONFIRM3; phase = QEMU_MIGRATION_PHASE_CONFIRM3;
qemuMigrationJobStartPhase(vm, phase); if (qemuMigrationJobStartPhase(vm, phase) < 0)
return;
if (job == VIR_ASYNC_JOB_MIGRATION_IN) if (job == VIR_ASYNC_JOB_MIGRATION_IN)
qemuMigrationDstComplete(driver, vm, true, job, &priv->job); qemuMigrationDstComplete(driver, vm, true, job, &priv->job);