External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inhibit daemon shutdown during driver initialization

Browse Source 
As of 1a50ba2cb0 qemu capabilities probing
takes longer since we timeout waiting for the monitor socket. When
probing qemu for different architectures this can add up so the daemon
auto shutdown timeout is reached and the client doesn't have a chance
to connect. To avoid that inhibit daemon shutdown during driver
initialization (which includes capabilities probing).

This fixes

	http://honk.sigxcpu.org:8001/job/libvirt-tck-debian-wheezy-qemu-session/227/
This commit is contained in:
Guido Günther 2012-12-05 20:21:14 +01:00
parent a33f4eae83
commit 6856b93710
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/libvirtd.c
View File

@ -846,6 +846,10 @@ static void daemonRunStateInit(void *opaque)
{
virNetServerPtr srv = opaque;
/* Since driver initialization can take time inhibit daemon shutdown until
we're done so clients get a chance to connect */
daemonInhibitCallback(true, srv);
/* Start the stateful HV drivers
* This is deliberately done after telling the parent process
* we're ready, since it can take a long time and this will
@ -856,8 +860,7 @@ static void daemonRunStateInit(void *opaque)
VIR_ERROR(_("Driver state initialization failed"));
/* Ensure the main event loop quits */
kill(getpid(), SIGTERM);
virObjectUnref(srv);
return;
goto cleanup;
}
#ifdef HAVE_DBUS
@ -879,9 +882,10 @@ static void daemonRunStateInit(void *opaque)
}
}
#endif
/* Only now accept clients from network */
virNetServerUpdateServices(srv, true);
cleanup:
daemonInhibitCallback(false, srv);
virObjectUnref(srv);
}