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 qemuMigrationRun a bit

Browse Source 
Some code which was supposed to be executed only when migration
succeeded was buried inside the cleanup code.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Jiri Denemark 2017-10-18 15:34:31 +02:00
parent 9603262377
commit f8ede9cc23
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/qemu/qemu_migration.c
View File

@ -3872,8 +3872,36 @@ qemuMigrationRun(virQEMUDriverPtr driver,
qemuMigrationSetOffline(driver, vm) < 0) { qemuMigrationSetOffline(driver, vm) < 0) {
goto cancelPostCopy; goto cancelPostCopy;
} }
if (priv->job.completed)
if (mig && mig->nbd &&
qemuMigrationCancelDriveMirror(driver, vm, true,
QEMU_ASYNC_JOB_MIGRATION_OUT,
dconn) < 0)
goto cancelPostCopy;
if (iothread) {
qemuMigrationIOThreadPtr io;
VIR_STEAL_PTR(io, iothread);
if (qemuMigrationStopTunnel(io, false) < 0)
goto cancelPostCopy;
}
if (priv->job.completed) {
priv->job.completed->stopped = priv->job.current->stopped; priv->job.completed->stopped = priv->job.current->stopped;
qemuDomainJobInfoUpdateTime(priv->job.completed);
qemuDomainJobInfoUpdateDowntime(priv->job.completed);
ignore_value(virTimeMillisNow(&priv->job.completed->sent));
}
cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK |
QEMU_MIGRATION_COOKIE_STATS;
if (qemuMigrationCookieAddPersistent(mig, &persistDef) < 0 ||
qemuMigrationBakeCookie(mig, driver, vm, cookieout,
cookieoutlen, cookieFlags) < 0) {
VIR_WARN("Unable to encode migration cookie");
}
ret = 0; ret = 0;
@ -3882,43 +3910,24 @@ qemuMigrationRun(virQEMUDriverPtr driver,
orig_err = virSaveLastError(); orig_err = virSaveLastError();
/* cancel any outstanding NBD jobs */ /* cancel any outstanding NBD jobs */
if (mig && mig->nbd) { if (ret < 0 && mig && mig->nbd)
if (qemuMigrationCancelDriveMirror(driver, vm, ret == 0, qemuMigrationCancelDriveMirror(driver, vm, false,
QEMU_ASYNC_JOB_MIGRATION_OUT, QEMU_ASYNC_JOB_MIGRATION_OUT,
dconn) < 0) dconn);
ret = -1;
}
VIR_FREE(tlsAlias); VIR_FREE(tlsAlias);
VIR_FREE(secAlias); VIR_FREE(secAlias);
virObjectUnref(cfg); virObjectUnref(cfg);
if (spec->fwdType != MIGRATION_FWD_DIRECT) { if (ret < 0 && iothread)
if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) qemuMigrationStopTunnel(iothread, true);
ret = -1;
}
VIR_FORCE_CLOSE(fd);
if (priv->job.completed) { VIR_FORCE_CLOSE(fd);
qemuDomainJobInfoUpdateTime(priv->job.completed);
qemuDomainJobInfoUpdateDowntime(priv->job.completed);
ignore_value(virTimeMillisNow(&priv->job.completed->sent));
}
if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE || if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||
priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_MIGRATING) priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_MIGRATING)
priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_FAILED; priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_FAILED;
cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK |
QEMU_MIGRATION_COOKIE_STATS;
if (ret == 0 &&
(qemuMigrationCookieAddPersistent(mig, &persistDef) < 0 ||
qemuMigrationBakeCookie(mig, driver, vm, cookieout,
cookieoutlen, cookieFlags) < 0)) {
VIR_WARN("Unable to encode migration cookie");
}
virDomainDefFree(persistDef); virDomainDefFree(persistDef);
qemuMigrationCookieFree(mig); qemuMigrationCookieFree(mig);