External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Migration job on destination daemon

Browse Source 
Make MIGRATION_IN use the new helper methods.
This commit is contained in:
Jiri Denemark 2011-07-19 02:27:31 +02:00 committed by Eric Blake
parent 9271367067
commit eeb008dbfc
3 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_domain.c
View File

@ -645,7 +645,7 @@ void qemuDomainSetNamespaceHooks(virCapsPtr caps)
caps->ns.href = qemuDomainDefNamespaceHref; caps->ns.href = qemuDomainDefNamespaceHref;
} }
void static void
qemuDomainObjSaveJob(struct qemud_driver *driver, virDomainObjPtr obj) qemuDomainObjSaveJob(struct qemud_driver *driver, virDomainObjPtr obj)
{ {
if (!virDomainObjIsActive(obj)) { if (!virDomainObjIsActive(obj)) {

1
src/qemu/qemu_domain.h
View File

@ -187,7 +187,6 @@ int qemuDomainObjEndAsyncJob(struct qemud_driver *driver,
void qemuDomainObjEndNestedJob(struct qemud_driver *driver, void qemuDomainObjEndNestedJob(struct qemud_driver *driver,
virDomainObjPtr obj); virDomainObjPtr obj);
void qemuDomainObjSaveJob(struct qemud_driver *driver, virDomainObjPtr obj);
void qemuDomainObjSetJobPhase(struct qemud_driver *driver, void qemuDomainObjSetJobPhase(struct qemud_driver *driver,
virDomainObjPtr obj, virDomainObjPtr obj,
int phase); int phase);

97
src/qemu/qemu_migration.c
View File

@ -1130,9 +1130,9 @@ qemuMigrationPrepareAny(struct qemud_driver *driver,
QEMU_MIGRATION_COOKIE_LOCKSTATE))) QEMU_MIGRATION_COOKIE_LOCKSTATE)))
goto cleanup; goto cleanup;
if (qemuDomainObjBeginAsyncJobWithDriver(driver, vm, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
goto cleanup; goto cleanup;
qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PREPARE);
/* Domain starts inactive, even if the domain XML had an id field. */ /* Domain starts inactive, even if the domain XML had an id field. */
vm->def->id = -1; vm->def->id = -1;
@ -1190,29 +1190,20 @@ qemuMigrationPrepareAny(struct qemud_driver *driver,
event = virDomainEventNewFromObj(vm, event = virDomainEventNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_MIGRATED); VIR_DOMAIN_EVENT_STARTED_MIGRATED);
ret = 0;
endjob: /* We keep the job active across API calls until the finish() call.
if (qemuDomainObjEndAsyncJob(driver, vm) == 0) { * This prevents any other APIs being invoked while incoming
vm = NULL; * migration is taking place.
} else if (!vm->persistent && !virDomainObjIsActive(vm)) {
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
/* We set a fake job active which is held across
* API calls until the finish() call. This prevents
* any other APIs being invoked while incoming
* migration is taking place
*/ */
if (vm && if (qemuMigrationJobContinue(vm) == 0) {
virDomainObjIsActive(vm)) { vm = NULL;
priv->job.asyncJob = QEMU_ASYNC_JOB_MIGRATION_IN; qemuReportError(VIR_ERR_OPERATION_FAILED,
qemuDomainObjSaveJob(driver, vm); "%s", _("domain disappeared"));
priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED; goto cleanup;
priv->job.start = now;
} }
ret = 0;
cleanup: cleanup:
virDomainDefFree(def); virDomainDefFree(def);
VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[0]);
@ -1223,6 +1214,15 @@ cleanup:
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
qemuMigrationCookieFree(mig); qemuMigrationCookieFree(mig);
return ret; return ret;
endjob:
if (qemuMigrationJobFinish(driver, vm) == 0) {
vm = NULL;
} else if (!vm->persistent) {
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
goto cleanup;
} }
@ -2403,27 +2403,23 @@ qemuMigrationFinish(struct qemud_driver *driver,
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
int newVM = 1; int newVM = 1;
qemuDomainObjPrivatePtr priv = NULL;
qemuMigrationCookiePtr mig = NULL; qemuMigrationCookiePtr mig = NULL;
virErrorPtr orig_err = NULL;
VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
"cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d",
driver, dconn, vm, NULLSTR(cookiein), cookieinlen, driver, dconn, vm, NULLSTR(cookiein), cookieinlen,
cookieout, cookieoutlen, flags, retcode); cookieout, cookieoutlen, flags, retcode);
virErrorPtr orig_err = NULL;
priv = vm->privateData; if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN))
if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_IN) {
qemuReportError(VIR_ERR_NO_DOMAIN,
_("domain '%s' is not processing incoming migration"), vm->def->name);
goto cleanup; goto cleanup;
}
qemuDomainObjDiscardAsyncJob(driver, vm); qemuMigrationJobStartPhase(driver, vm,
v3proto ? QEMU_MIGRATION_PHASE_FINISH3
: QEMU_MIGRATION_PHASE_FINISH2);
if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0)))
goto cleanup; goto endjob;
if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
/* Did the migration go as planned? If yes, return the domain /* Did the migration go as planned? If yes, return the domain
* object, but if no, clean up the empty qemu process. * object, but if no, clean up the empty qemu process.
@ -2454,21 +2450,14 @@ qemuMigrationFinish(struct qemud_driver *driver,
*/ */
/* /*
* In v3 protocol, the source VM is still available to * However, in v3 protocol, the source VM is still available
* restart during confirm() step, so we kill it off * to restart during confirm() step, so we kill it off now.
* now.
* In v2 protocol, the source is dead, so we leave
* target in paused state, in case admin can fix
* things up
*/ */
if (v3proto) { if (v3proto) {
qemuProcessStop(driver, vm, 1, VIR_DOMAIN_SHUTOFF_FAILED); qemuProcessStop(driver, vm, 1, VIR_DOMAIN_SHUTOFF_FAILED);
virDomainAuditStop(vm, "failed"); virDomainAuditStop(vm, "failed");
if (newVM) { if (newVM)
if (qemuDomainObjEndJob(driver, vm) > 0) vm->persistent = 0;
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
} }
goto endjob; goto endjob;
} }
@ -2481,7 +2470,6 @@ qemuMigrationFinish(struct qemud_driver *driver,
if (event) if (event)
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
event = NULL; event = NULL;
} }
if (!(flags & VIR_MIGRATE_PAUSED)) { if (!(flags & VIR_MIGRATE_PAUSED)) {
@ -2513,11 +2501,6 @@ qemuMigrationFinish(struct qemud_driver *driver,
event = virDomainEventNewFromObj(vm, event = virDomainEventNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
if (!vm->persistent) {
if (qemuDomainObjEndJob(driver, vm) > 0)
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
} }
goto endjob; goto endjob;
} }
@ -2549,20 +2532,20 @@ qemuMigrationFinish(struct qemud_driver *driver,
event = virDomainEventNewFromObj(vm, event = virDomainEventNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
if (!vm->persistent) {
if (qemuDomainObjEndJob(driver, vm) > 0)
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
} }
if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0)
VIR_WARN("Unable to encode migration cookie"); VIR_WARN("Unable to encode migration cookie");
endjob: endjob:
if (vm && if (vm) {
qemuDomainObjEndJob(driver, vm) == 0) if (qemuMigrationJobFinish(driver, vm) == 0) {
vm = NULL; vm = NULL;
} else if (!vm->persistent && !virDomainObjIsActive(vm)) {
virDomainRemoveInactive(&driver->domains, vm);
vm = NULL;
}
}
cleanup: cleanup:
if (vm) if (vm)