提交 11119821 编写于 作者: W Wang Rui 提交者: Martin Kletzander

qemu: set jobinfo type to FAILED if job is failed in qemuMigrationRun

If job is failed in qemuMigrationRun, we expect the jobinfo type as
FAILED. But jobinfo type won't be updated until entering
qemuMigrationWaitForCompletion. We should make it updated in all
conditions. Moreover, we can't use qemuMigrationUpdateJobStatus
here because job may fail in libvirt, so we can't query job status
from QEMU.
Signed-off-by: NWang Rui <moon.wangrui@huawei.com>
上级 0b0cba4d
......@@ -3723,8 +3723,10 @@ qemuMigrationRun(virQEMUDriverPtr driver,
* confirm3 step, but need to release the lock state
*/
if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
if (qemuMigrationSetOffline(driver, vm) < 0)
if (qemuMigrationSetOffline(driver, vm) < 0) {
priv->job.current->type = VIR_DOMAIN_JOB_FAILED;
goto cleanup;
}
}
ret = 0;
......@@ -3748,6 +3750,9 @@ qemuMigrationRun(virQEMUDriverPtr driver,
qemuDomainJobInfoUpdateDowntime(priv->job.completed);
}
if (priv->job.current->type == VIR_DOMAIN_JOB_UNBOUNDED)
priv->job.current->type = VIR_DOMAIN_JOB_FAILED;
cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK |
QEMU_MIGRATION_COOKIE_STATS;
if (flags & VIR_MIGRATE_PERSIST_DEST)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册