External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Do not reset labels when migration fails

Browse Source 
When stopping a domain on the destination host after a failed migration,
we need to avoid reseting security labels since the domain is still
running on the source host. While we were correctly doing so in some
cases, there were still some paths which did this wrong.

https://bugzilla.redhat.com/show_bug.cgi?id=1242904

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-07-30 16:42:43 +02:00
parent 40a6dd9c16
commit e8d0166e1d
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_driver.c
View File

@ -2187,6 +2187,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
int ret = -1; int ret = -1;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
unsigned int stopFlags = 0;
virCheckFlags(VIR_DOMAIN_DESTROY_GRACEFUL, -1); virCheckFlags(VIR_DOMAIN_DESTROY_GRACEFUL, -1);
@ -2200,6 +2201,8 @@ qemuDomainDestroyFlags(virDomainPtr dom,
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(driver, vm, false);
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
/* We need to prevent monitor EOF callback from doing our work (and sending /* We need to prevent monitor EOF callback from doing our work (and sending
* misleading events) while the vm is unlocked inside BeginJob/ProcessKill API * misleading events) while the vm is unlocked inside BeginJob/ProcessKill API
@ -2234,7 +2237,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
goto endjob; goto endjob;
} }
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, stopFlags);
event = virDomainEventLifecycleNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);

3
src/qemu/qemu_migration.c
View File

@ -3474,7 +3474,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
stop: stop:
virDomainAuditStart(vm, "migrated", false); virDomainAuditStart(vm, "migrated", false);
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_QEMU_PROCESS_STOP_MIGRATED);
endjob: endjob:
qemuMigrationJobFinish(driver, vm); qemuMigrationJobFinish(driver, vm);

19
src/qemu/qemu_process.c
View File

@ -285,6 +285,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; int eventReason = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN;
int stopReason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; int stopReason = VIR_DOMAIN_SHUTOFF_SHUTDOWN;
const char *auditReason = "shutdown"; const char *auditReason = "shutdown";
unsigned int stopFlags = 0;
VIR_DEBUG("Received EOF on %p '%s'", vm, vm->def->name); VIR_DEBUG("Received EOF on %p '%s'", vm, vm->def->name);
@ -310,14 +311,16 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
auditReason = "failed"; auditReason = "failed";
} }
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) {
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
qemuMigrationErrorSave(driver, vm->def->name, qemuMigrationErrorSave(driver, vm->def->name,
qemuMonitorLastError(priv->mon)); qemuMonitorLastError(priv->mon));
}
event = virDomainEventLifecycleNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
eventReason); eventReason);
qemuProcessStop(driver, vm, stopReason, 0); qemuProcessStop(driver, vm, stopReason, stopFlags);
virDomainAuditStop(vm, auditReason); virDomainAuditStop(vm, auditReason);
if (!vm->persistent) { if (!vm->persistent) {
@ -3732,10 +3735,13 @@ qemuProcessReconnect(void *opaque)
virQEMUDriverConfigPtr cfg; virQEMUDriverConfigPtr cfg;
size_t i; size_t i;
int ret; int ret;
unsigned int stopFlags = 0;
VIR_FREE(data); VIR_FREE(data);
qemuDomainObjRestoreJob(obj, &oldjob); qemuDomainObjRestoreJob(obj, &oldjob);
if (oldjob.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
priv = obj->privateData; priv = obj->privateData;
@ -3916,7 +3922,7 @@ qemuProcessReconnect(void *opaque)
* really is and FAILED means "failed to start" */ * really is and FAILED means "failed to start" */
state = VIR_DOMAIN_SHUTOFF_UNKNOWN; state = VIR_DOMAIN_SHUTOFF_UNKNOWN;
} }
qemuProcessStop(driver, obj, state, 0); qemuProcessStop(driver, obj, state, stopFlags);
} }
if (!obj->persistent) if (!obj->persistent)
@ -5693,9 +5699,13 @@ qemuProcessAutoDestroy(virDomainObjPtr dom,
virQEMUDriverPtr driver = opaque; virQEMUDriverPtr driver = opaque;
qemuDomainObjPrivatePtr priv = dom->privateData; qemuDomainObjPrivatePtr priv = dom->privateData;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
unsigned int stopFlags = 0;
VIR_DEBUG("vm=%s, conn=%p", dom->def->name, conn); VIR_DEBUG("vm=%s, conn=%p", dom->def->name, conn);
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
if (priv->job.asyncJob) { if (priv->job.asyncJob) {
VIR_DEBUG("vm=%s has long-term job active, cancelling", VIR_DEBUG("vm=%s has long-term job active, cancelling",
dom->def->name); dom->def->name);
@ -5708,8 +5718,7 @@ qemuProcessAutoDestroy(virDomainObjPtr dom,
VIR_DEBUG("Killing domain"); VIR_DEBUG("Killing domain");
qemuProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED, qemuProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED, stopFlags);
VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(dom, "destroyed"); virDomainAuditStop(dom, "destroyed");
event = virDomainEventLifecycleNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,