libxl: acquire job in migration finish phase

Moving data reception of the perform phase of migration to a
thread introduces a race with the finish phase, where checking
if the domain is active races with the thread finishing the
perform phase.  The race is easily solved by acquiring a job in
the finish phase, which must wait for the perform phase job to
complete.

While wrapping the finish phase in a job, noticed the virDomainObj
was being unlocked in a callee - libxlDomainMigrationFinish.  Move
the unlocking to libxlDomainMigrateFinish3Params, where the lock
is acquired.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2014-11-13 14:41:56 -07:00
parent cb88d4333a
commit a1f389515c
2 changed files with 17 additions and 4 deletions

View File

@ -4650,6 +4650,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn,
libxlDriverPrivatePtr driver = dconn->privateData;
virDomainObjPtr vm = NULL;
const char *dname = NULL;
virDomainPtr ret = NULL;
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError();
@ -4680,16 +4681,29 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn,
return NULL;
}
if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) {
virObjectUnlock(vm);
return NULL;
}
if (!virDomainObjIsActive(vm)) {
/* Migration failed if domain is inactive */
virReportError(VIR_ERR_OPERATION_FAILED,
"%s", _("Migration failed. Domain is not running "
"on destination host"));
virObjectUnlock(vm);
return NULL;
goto endjob;
}
return libxlDomainMigrationFinish(dconn, vm, flags, cancelled);
ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled);
endjob:
if (!libxlDomainObjEndJob(driver, vm))
vm = NULL;
if (vm)
virObjectUnlock(vm);
return ret;
}
static int

View File

@ -573,7 +573,6 @@ libxlDomainMigrationFinish(virConnectPtr dconn,
cleanup:
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnlock(vm);
virObjectUnref(cfg);
return dom;
}