[libvirt] [PATCH V2 4/4] libxl: destroy domain in migration finish phase on failure
This patch contains three domain cleanup improvements in the migration
finish phase, ensuring a domain is properly disposed when a failure is
detected or the migration is cancelled.
The check for virDomainObjIsActive is moved to libxlDomainMigrationFinish,
where cleanup can occur if migration failed and the domain is inactive.
The 'cleanup' label was missplaced in libxlDomainMigrationFinish, causing
a migrated domain to remain in the event of an error or cancelled migration.
In cleanup, the domain was not removed from the driver's list of domains.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
Changes in V2:
- Move virDomainObjIsActive to libxlDomainMigrationFinish
- On error or migration cancel, remove domain from driver's list of domains
src/libxl/libxl_driver.c | 9 ---------
src/libxl/libxl_migration.c | 20 ++++++++++++++++----
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 651d4eb..d01ff6e 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -4690,17 +4690,8 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn,
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"));
- goto endjob;
- }
-
ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled);
- endjob:
if (!libxlDomainObjEndJob(driver, vm))
vm = NULL;
diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 6f83b08..0caa3d0 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -537,6 +537,16 @@ libxlDomainMigrationFinish(virConnectPtr dconn,
if (cancelled)
goto cleanup;
+ /* Check if domain is alive */
+ if (!virDomainObjIsActive(vm)) {
+ /* Migration failed if domain is inactive */
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ "%s", _("Migration failed. Domain is not running
"
+ "on destination host"));
+ goto cleanup;
+ }
+
+ /* Unpause if requested */
if (!(flags & VIR_MIGRATE_PAUSED)) {
if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
@@ -556,24 +566,26 @@ libxlDomainMigrationFinish(virConnectPtr dconn,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
}
- if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
- goto cleanup;
-
if (event) {
libxlDomainEventQueue(driver, event);
event = NULL;
}
+ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
+ goto cleanup;
+
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid);
+ cleanup:
if (dom == NULL) {
libxl_domain_destroy(priv->ctx, vm->def->id, NULL);
libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED);
+ if (!vm->persistent)
+ virDomainObjListRemove(driver->domains, vm);
}
- cleanup:
if (event)
libxlDomainEventQueue(driver, event);
virObjectUnref(cfg);
--
1.8.4.5