提交 6856b937 编写于 作者: G Guido Günther

Inhibit daemon shutdown during driver initialization

As of 1a50ba2c 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/
上级 a33f4eae
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册