shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

Fix deadlock on libvirtd shutdown

Browse Source 
When shutting down libvirtd, the virNetServer shutdown can deadlock
if there are in-flight jobs being handled by virNetServerHandleJob().
virNetServerFree() will acquire the virNetServer lock and call
virThreadPoolFree() to terminate the workers, waiting for the workers
to finish.  But in-flight workers will attempt to acquire the
virNetServer lock, resulting in deadlock.

Fix the deadlock by unlocking the virNetServer lock before calling
virThreadPoolFree().  This is safe since the virNetServerPtr object
is ref-counted and only decrementing the ref count needs to be
protected.  Additionally, there is no need to re-acquire the lock
after virThreadPoolFree() completes as all the workers have
terminated.
This commit is contained in:
Jim Fehlig 2012-06-21 09:21:44 -06:00
parent fd4fd420b4
commit 0dda594da9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/virnetserver.c
View File

@ -766,10 +766,9 @@ void virNetServerFree(virNetServerPtr srv)
virNetServerLock(srv);
VIR_DEBUG("srv=%p refs=%d", srv, srv->refs);
srv->refs--;
if (srv->refs > 0) {
virNetServerUnlock(srv);
virNetServerUnlock(srv);
if (srv->refs > 0)
return;
}
for (i = 0 ; i < srv->nservices ; i++)
virNetServerServiceToggle(srv->services[i], false);
@ -805,7 +804,6 @@ void virNetServerFree(virNetServerPtr srv)
virNetServerMDNSFree(srv->mdns);
#endif
virNetServerUnlock(srv);
virMutexDestroy(&srv->lock);
VIR_FREE(srv);
}