[PATCH 4/4] ch: fix timeout while domain is still running
Previously, the CH driver would timeout even if one or more domains
were still running, only an active virsh session prevented the
driver's timeout.
To address this, an inhibitor has been added to ensure driver remains
active as long as any domain is still running. Inhibitor is now held
when a domain starts up or when the driver successfully reconnects to
a running domain. This now prevents the driver from timeout while any
domain is still running. Inhibitor is later released with domain
shutdown, ensuring correct running domains count.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/743
Signed-off-by: Kirill Shchetiniuk <kshcheti(a)redhat.com>
---
src/ch/ch_conf.h | 4 ++++
src/ch/ch_driver.c | 15 +++++++++++++--
src/ch/ch_process.c | 6 ++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/ch/ch_conf.h b/src/ch/ch_conf.h
index 8beeb69b95..ca9151e5d8 100644
--- a/src/ch/ch_conf.h
+++ b/src/ch/ch_conf.h
@@ -26,6 +26,7 @@
#include "ch_capabilities.h"
#include "virebtables.h"
#include "object_event.h"
+#include "virinhibitor.h"
#define CH_DRIVER_NAME "CH"
#define CH_CMD "cloud-hypervisor"
@@ -92,6 +93,9 @@ struct _virCHDriver
/* Immutable pointer, self-locking APIs */
virObjectEventState *domainEventState;
+
+ /* Immutable pointer, self-locking APIs */
+ virInhibitor *inhibitor;
};
#define CH_SAVE_MAGIC "libvirt-xml\n \0 \r"
diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 465528baf1..2d72de3ed2 100644
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -42,6 +42,7 @@
#include "viruuid.h"
#include "virnuma.h"
#include "virhostmem.h"
+#include "virinhibitor.h"
#define VIR_FROM_THIS VIR_FROM_CH
@@ -1411,6 +1412,7 @@ static int chStateCleanup(void)
virObjectUnref(ch_driver->domains);
virObjectUnref(ch_driver->hostdevMgr);
virObjectUnref(ch_driver->domainEventState);
+ virInhibitorFree(ch_driver->inhibitor);
virMutexDestroy(&ch_driver->lock);
g_clear_pointer(&ch_driver, g_free);
@@ -1421,8 +1423,8 @@ static virDrvStateInitResult
chStateInitialize(bool privileged,
const char *root,
bool monolithic G_GNUC_UNUSED,
- virStateInhibitCallback callback G_GNUC_UNUSED,
- void *opaque G_GNUC_UNUSED)
+ virStateInhibitCallback callback,
+ void *opaque)
{
int ret = VIR_DRV_STATE_INIT_ERROR;
int rv;
@@ -1473,6 +1475,15 @@ chStateInitialize(bool privileged,
goto cleanup;
}
+ /* Setup inhibitor to be able to avoid timeout */
+ ch_driver->inhibitor = virInhibitorNew(VIR_INHIBITOR_WHAT_SHUTDOWN,
+ _("Libvirt Cloud-Hypervisor"),
+ _("Cloud-Hypervisor virtual machines are
running"),
+ VIR_INHIBITOR_MODE_DELAY,
+ callback,
+ opaque);
+
+
/* Transient domains load */
if (virDomainObjListLoadAllConfigs(ch_driver->domains,
cfg->stateDir,
diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c
index d7a5ecc09c..8f61a5f220 100644
--- a/src/ch/ch_process.c
+++ b/src/ch/ch_process.c
@@ -997,6 +997,8 @@ virCHProcessStart(virCHDriver *driver,
virCHDomainSaveStatus(vm);
+ virInhibitorHold(driver->inhibitor);
+
return 0;
cleanup:
@@ -1072,6 +1074,8 @@ virCHProcessStop(virCHDriver *driver,
vm->def->id = -1;
g_clear_pointer(&priv->machineName, g_free);
+ virInhibitorRelease(driver->inhibitor);
+
virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason);
virHostdevReAttachDomainDevices(driver->hostdevMgr, CH_DRIVER_NAME, def,
@@ -1253,6 +1257,8 @@ virCHProcessReconnect(void *opaque)
if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
goto error;
+ virInhibitorHold(driver->inhibitor);
+
cleanup:
virDomainObjEndJob(vm);
virDomainObjEndAPI(&vm);
--
2.48.1