[libvirt] [PATCH] qemu: Update fsfreeze status on domain state transitions
As of b6d4dad1 (1.2.5) libvirt keeps track if domain disks have been frozen. However, this falls into that set of information which don't survive domain restart. Therefore, we need to clear the flag upon some state transitions. Moreover, once we clear the flag we must update the status file too. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2eaf77d..03c04ce 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4040,11 +4040,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } - switch (action) { case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY: if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0) { @@ -4102,6 +4097,11 @@ processGuestPanicEvent(virQEMUDriverPtr driver, } cleanup: + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + virObjectUnref(cfg); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba8ba82..0df375c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -529,6 +529,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverPtr driver = opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); @@ -536,12 +537,20 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + /* Clear some domain runtime information. For instance, + * fsfreeze won't survive domain reset. This, however, + * required the domain status file to be rewritten onto disk. */ + priv->quiesced = false; virObjectUnlock(vm); + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + VIR_WARN("Failed to save status on vm %s", vm->def->name); + if (event) qemuDomainEventQueue(driver, event); + virObjectUnref(cfg); return 0; } @@ -4841,6 +4850,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; + priv->quiesced = false; if (priv->agent) { qemuAgentClose(priv->agent); -- 2.0.4
On Mon, Nov 03, 2014 at 01:22:07PM +0100, Michal Privoznik wrote:
As of b6d4dad1 (1.2.5) libvirt keeps track if domain disks have been frozen. However, this falls into that set of information which don't survive domain restart. Therefore, we need to clear the flag upon some state transitions. Moreover, once we clear the flag we must update the status file too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-)
[...]
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba8ba82..0df375c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -536,12 +537,20 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + /* Clear some domain runtime information. For instance, + * fsfreeze won't survive domain reset. This, however, + * required the domain status file to be rewritten onto disk. */ + priv->quiesced = false;
virObjectUnlock(vm);
+ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + VIR_WARN("Failed to save status on vm %s", vm->def->name); +
The domain has to be locked when you're saving it, ACK if you move these two lines before the virObjectUnlock(vm) call. Martin
On 06.11.2014 14:46, Martin Kletzander wrote:
On Mon, Nov 03, 2014 at 01:22:07PM +0100, Michal Privoznik wrote:
As of b6d4dad1 (1.2.5) libvirt keeps track if domain disks have been frozen. However, this falls into that set of information which don't survive domain restart. Therefore, we need to clear the flag upon some state transitions. Moreover, once we clear the flag we must update the status file too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-)
[...]
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba8ba82..0df375c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -536,12 +537,20 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + /* Clear some domain runtime information. For instance, + * fsfreeze won't survive domain reset. This, however, + * required the domain status file to be rewritten onto disk. */ + priv->quiesced = false;
virObjectUnlock(vm);
+ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + VIR_WARN("Failed to save status on vm %s", vm->def->name); +
The domain has to be locked when you're saving it, ACK if you move these two lines before the virObjectUnlock(vm) call.
Yeah, I wanted to make the critical section as short as possible, but hadn't realized VM definition can change once the domain's unlocked. So SaveStatus() can access stale pointers then what can lead to SIGSEGV. Fixed and pushed, thanks. Michal
participants (2)
-
Martin Kletzander -
Michal Privoznik