External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 21:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: resume lock process after failed migration

Browse Source 
During migration, the lock process is paused in the perform phase
but not resumed if there is a subsequent failure, leaving the locked
resource unprotected.

The perform phase itself can fail, in which case the lock process
should be resumed before returning from perform. The finish phase
could also fail on the destination host, in which case the migration
is canceled in the confirm phase and the VM is resumed. The lock
process needs to be resumed there as well.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2018-01-24 14:23:04 -07:00
parent 47bb586c75
commit 0c710a37ea
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libxl/libxl_migration.c
View File

@ -1238,6 +1238,12 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver,
ret = libxlDoMigrateSend(driver, vm, flags, sockfd);
virObjectLock(vm);
if (ret < 0)
virDomainLockProcessResume(driver->lockManager,
"xen:///system",
vm,
priv->lockState);
cleanup:
VIR_FORCE_CLOSE(sockfd);
virURIFree(uri);
@ -1349,10 +1355,16 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver,
int cancelled)
{
libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
libxlDomainObjPrivatePtr priv = vm->privateData;
virObjectEventPtr event = NULL;
int ret = -1;
if (cancelled) {
/* Resume lock process that was paused in MigrationPerform */
virDomainLockProcessResume(driver->lockManager,
"xen:///system",
vm,
priv->lockState);
if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) == 0) {
ret = 0;
} else {