提交 d325704a 编写于 作者: J Jiri Denemark

qemu: Clear async job when p2p migration fails early

When p2p migration fails early because qemuMigrationIsAllowed or
qemuMigrationIsSafe say migration should be cancelled, we fail to clear
the migration-out async job. As a result of that, further APIs called
for the same domain may fail with Timed out during operation: cannot
acquire state change lock.

Reported by Guido Winkelmann.
上级 997d97c3
...@@ -2624,10 +2624,10 @@ qemuMigrationPerformJob(struct qemud_driver *driver, ...@@ -2624,10 +2624,10 @@ qemuMigrationPerformJob(struct qemud_driver *driver,
} }
if (!qemuMigrationIsAllowed(driver, vm, NULL)) if (!qemuMigrationIsAllowed(driver, vm, NULL))
goto cleanup; goto endjob;
if (!(flags & VIR_MIGRATE_UNSAFE) && !qemuMigrationIsSafe(vm->def)) if (!(flags & VIR_MIGRATE_UNSAFE) && !qemuMigrationIsSafe(vm->def))
goto cleanup; goto endjob;
resume = virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING; resume = virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册