Re: [libvirt] [PATCH 2/2] Add a watchdog action `managed'.

`managed' watchdog action lets libvirtd decide what to do if a guest watchdog fires. It has a subaction argument which is the action libvirtd will take. Currently only `dump' subaction is defined, it tells libvirtd to dump the guest on a watchdog event. `managed' watchdog action is mapped to `none' qemu watchdog action, thus qemu will not get in the way of libvirtd's handling of watchdog events.

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 790ce98..49584c8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -106,6 +106,12 @@ enum qemud_cmd_flags { struct qemud_driver { virMutex lock; + virMutex workerPoolLock; + int poolRef; + struct virWorkerPool *workerPool; + int watchdogEventCallbackID; + virConnectPtr conn;

@@ -4425,6 +4424,82 @@ retry: } } +struct watchdogEvent +{ + virDomain dom; + int action; + void *actionArg; +}; + +static void processWatchdogEvent(void *data) +{ + struct watchdogEvent *wdEvent = data; + + switch (wdEvent->action) { + case VIR_DOMAIN_WATCHDOG_SUBACTION_DUMP: + { + char *path = wdEvent->actionArg; + char dumpfilePath[4096]; + int i; + + i = snprintf(dumpfilePath, 4096, "%s/%s-%u", path, wdEvent->dom.name, (unsigned int)time(NULL)); + dumpfilePath[i] = '\0';

+ virDomainCoreDump(&wdEvent->dom, dumpfilePath, 0);

+ } + break; + } + + free(wdEvent->dom.name); + free(wdEvent); +}

+ +static int onWatchdogEvent(virConnectPtr conn, + virDomainPtr dom, + int action, + void *opaque ATTRIBUTE_UNUSED) +{ + struct qemud_driver *driver = conn->privateData; + struct watchdogEvent *wdEvent; + virDomainObjPtr vm; + + wdEvent = malloc(sizeof(*wdEvent)); + if (!wdEvent) + return -1;

+ + vm = virDomainFindByID(&driver->domains, dom->id); + if (!vm || !vm->def->watchdog) { + free(wdEvent); + return -1; + } + + if (vm->def->watchdog->action != VIR_DOMAIN_WATCHDOG_ACTION_MANAGED) { + virDomainObjUnlock(vm); + free(wdEvent); + return 0; + } + + if (action != 0) + return 0; + + wdEvent->dom = *dom; + wdEvent->dom.name = malloc(strlen(dom->name)); + if (!wdEvent->dom.name) { + virDomainObjUnlock(vm); + free(wdEvent); + return -1; + } + strcpy(wdEvent->dom.name, dom->name); + + wdEvent->action = vm->def->watchdog->subaction; + wdEvent->actionArg = vm->def->watchdog->subactionArg; + + virWorkerPoolSendJob(driver->workerPool, wdEvent); + virDomainObjUnlock(vm); + + return 0; +} + + static virDrvOpenStatus qemudOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { @@ -4481,6 +4556,30 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, } } } + + virMutexLock(&qemu_driver->workerPoolLock); + if (!qemu_driver->workerPool) { + qemu_driver->workerPool = virWorkerPoolNew(0, 1, processWatchdogEvent); + if (qemu_driver->workerPool) { + qemu_driver->watchdogEventCallbackID = virDomainEventCallbackListAddID(conn, + qemu_driver->domainEventCallbacks, + NULL, + VIR_DOMAIN_EVENT_ID_WATCHDOG, + VIR_DOMAIN_EVENT_CALLBACK(onWatchdogEvent), + NULL, + NULL); + if (qemu_driver->watchdogEventCallbackID == -1) { + virWorkerPoolFree(qemu_driver->workerPool); + qemu_driver->workerPool = NULL; + } else { + qemu_driver->poolRef = 1; + conn->refs--; + } + } + } else + qemu_driver->poolRef++; + virMutexUnlock(&qemu_driver->workerPoolLock);

+ conn->privateData = qemu_driver; return VIR_DRV_OPEN_SUCCESS; @@ -4489,6 +4588,15 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, static int qemudClose(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; + virMutexLock(&driver->workerPoolLock); + if (--driver->poolRef == 0) { + conn->refs--; + virDomainEventCallbackListRemoveID(conn, driver->domainEventCallbacks, driver->watchdogEventCallbackID); + virWorkerPoolFree(driver->workerPool); + driver->workerPool = NULL; + } + virMutexUnlock(&driver->workerPoolLock);