External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc User Mode Linux startup/shutdown bugs

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-06-03 10:55:33 +00:00
parent 7d633ec400
commit 7cce4768ae
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Jun 3 11:53:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Misc User Mode Linux startup/shutdown bugs
* src/util.c: Make virKillProcess refuse to kill PID==1 too
* src/uml_driver.c: Increment retries counter when starting
guest. Check for monitor command failure. Use unique source
socket per domain for talking to monitor. Use virKillProcess
for killing guests. Fix guest cleanup when getting inotify
Wed Jun 3 11:32:52 BST 2009 Daniel P. Berrange <berrange@redhat.com> Wed Jun 3 11:32:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* qemud/qemud.c: Honour LIBVIRT_LOG_FILTERS/OUTPUTS env variables * qemud/qemud.c: Honour LIBVIRT_LOG_FILTERS/OUTPUTS env variables

42
src/uml_driver.c
View File

@ -166,9 +166,10 @@ umlIdentifyOneChrPTY(virConnectPtr conn,
return -1; return -1;
} }
requery: requery:
umlMonitorCommand(NULL, driver, dom, cmd, &res); if (umlMonitorCommand(NULL, driver, dom, cmd, &res) < 0)
return -1;
if (STRPREFIX(res, "pts:")) { if (res && STRPREFIX(res, "pts:")) {
VIR_FREE(def->data.file.path); VIR_FREE(def->data.file.path);
if ((def->data.file.path = strdup(res + 4)) == NULL) { if ((def->data.file.path = strdup(res + 4)) == NULL) {
virReportOOMError(conn); virReportOOMError(conn);
@ -176,7 +177,7 @@ requery:
VIR_FREE(cmd); VIR_FREE(cmd);
return -1; return -1;
} }
} else if (STRPREFIX(res, "pts")) { } else if (!res || STRPREFIX(res, "pts")) {
/* It can take a while to startup, so retry for /* It can take a while to startup, so retry for
upto 5 seconds */ upto 5 seconds */
/* XXX should do this in a better non-blocking /* XXX should do this in a better non-blocking
@ -263,19 +264,15 @@ reread:
} }
if (e->mask & IN_DELETE) { if (e->mask & IN_DELETE) {
VIR_DEBUG("Got inotify domain shutdown '%s'", name);
if (!virDomainIsActive(dom)) { if (!virDomainIsActive(dom)) {
virDomainObjUnlock(dom); virDomainObjUnlock(dom);
continue; continue;
} }
dom->def->id = -1; umlShutdownVMDaemon(NULL, driver, dom);
dom->pid = -1;
if (dom->newDef) {
virDomainDefFree(dom->def);
dom->def = dom->newDef;
}
dom->state = VIR_DOMAIN_SHUTOFF;
} else if (e->mask & (IN_CREATE | IN_MODIFY)) { } else if (e->mask & (IN_CREATE | IN_MODIFY)) {
VIR_DEBUG("Got inotify domain startup '%s'", name);
if (virDomainIsActive(dom)) { if (virDomainIsActive(dom)) {
virDomainObjUnlock(dom); virDomainObjUnlock(dom);
continue; continue;
@ -289,11 +286,13 @@ reread:
dom->def->id = driver->nextvmid++; dom->def->id = driver->nextvmid++;
dom->state = VIR_DOMAIN_RUNNING; dom->state = VIR_DOMAIN_RUNNING;
if (umlOpenMonitor(NULL, driver, dom) < 0) if (umlOpenMonitor(NULL, driver, dom) < 0) {
VIR_WARN0("Could not open monitor for new domain");
umlShutdownVMDaemon(NULL, driver, dom); umlShutdownVMDaemon(NULL, driver, dom);
} else if (umlIdentifyChrPTY(NULL, driver, dom) < 0) {
if (umlIdentifyChrPTY(NULL, driver, dom) < 0) VIR_WARN0("Could not identify charater devices for new domain");
umlShutdownVMDaemon(NULL, driver, dom); umlShutdownVMDaemon(NULL, driver, dom);
}
} }
virDomainObjUnlock(dom); virDomainObjUnlock(dom);
} }
@ -383,6 +382,7 @@ umlStartup(void) {
goto error; goto error;
} }
VIR_INFO("Adding inotify watch on %s", uml_driver->monitorDir);
if (inotify_add_watch(uml_driver->inotifyFD, if (inotify_add_watch(uml_driver->inotifyFD,
uml_driver->monitorDir, uml_driver->monitorDir,
IN_CREATE | IN_MODIFY | IN_DELETE) < 0) { IN_CREATE | IN_MODIFY | IN_DELETE) < 0) {
@ -595,10 +595,11 @@ static int umlOpenMonitor(virConnectPtr conn,
if (umlMonitorAddress(conn, driver, vm, &addr) < 0) if (umlMonitorAddress(conn, driver, vm, &addr) < 0)
return -1; return -1;
VIR_DEBUG("Dest address for monitor is '%s'", addr.sun_path);
restat: restat:
if (stat(addr.sun_path, &sb) < 0) { if (stat(addr.sun_path, &sb) < 0) {
if (errno == ENOENT && if (errno == ENOENT &&
retries < 50) { retries++ < 50) {
usleep(1000 * 100); usleep(1000 * 100);
goto restat; goto restat;
} }
@ -612,7 +613,8 @@ restat:
} }
memset(addr.sun_path, 0, sizeof addr.sun_path); memset(addr.sun_path, 0, sizeof addr.sun_path);
sprintf(addr.sun_path + 1, "%u", getpid()); sprintf(addr.sun_path + 1, "libvirt-uml-%u", vm->pid);
VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1);
if (bind(vm->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) { if (bind(vm->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) {
virReportSystemError(conn, errno, virReportSystemError(conn, errno,
"%s", _("cannot bind socket")); "%s", _("cannot bind socket"));
@ -657,6 +659,8 @@ static int umlMonitorCommand(virConnectPtr conn,
struct sockaddr_un addr; struct sockaddr_un addr;
unsigned int addrlen; unsigned int addrlen;
VIR_DEBUG("Run command '%s'", cmd);
*reply = NULL; *reply = NULL;
if (umlMonitorAddress(conn, driver, vm, &addr) < 0) if (umlMonitorAddress(conn, driver, vm, &addr) < 0)
@ -706,6 +710,8 @@ static int umlMonitorCommand(virConnectPtr conn,
} while (res.extra); } while (res.extra);
VIR_DEBUG("Command reply is '%s'", NULLSTR(retdata));
*reply = retdata; *reply = retdata;
return ret; return ret;
@ -852,12 +858,10 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
int ret; int ret;
if (!virDomainIsActive(vm) || if (!virDomainIsActive(vm))
vm->pid <= 1)
return; return;
virKillProcess(vm->pid, SIGTERM);
kill(vm->pid, SIGTERM);
if (vm->monitor != -1) if (vm->monitor != -1)
close(vm->monitor); close(vm->monitor);

2
src/util.c
View File

@ -1680,7 +1680,7 @@ char *virGetHostname(void)
/* send signal to a single process */ /* send signal to a single process */
int virKillProcess(pid_t pid, int sig) int virKillProcess(pid_t pid, int sig)
{ {
if (pid < 1) { if (pid <= 1) {
errno = ESRCH; errno = ESRCH;
return -1; return -1;
} }