External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirtd: Fix order of cleanup processing

Browse Source 
Current cleanup processing is ad-hoc at best - it's led to a couple of
strange and hard to diagnose timing problems and crashes.

So rather than perform cleanup in a somewhat random order, let's
perform cleanup in the exact opposite order of startup.

NB: It is possible that virNetlinkEventServerStart fails and we jump
to cleanup before driversInitialized has been set. That could leave
things inconsistent; however, resolution of that possibility is perhaps
more trouble than it's worth to handle.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-11-06 15:20:55 -05:00
parent 723cadd9ff
commit 2f3054c22a
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
daemon/libvirtd.c
View File

@ -1503,15 +1503,33 @@ int main(int argc, char **argv) {
0, "shutdown", NULL, NULL); 0, "shutdown", NULL, NULL);
cleanup: cleanup:
virNetlinkEventServiceStopAll(); /* Keep cleanup order in inverse order of startup */
virObjectUnref(remoteProgram);
virObjectUnref(lxcProgram);
virObjectUnref(qemuProgram);
virObjectUnref(adminProgram);
virNetDaemonClose(dmn); virNetDaemonClose(dmn);
virObjectUnref(srv);
virNetlinkEventServiceStopAll();
if (driversInitialized) {
/* NB: Possible issue with timing window between driversInitialized
* setting if virNetlinkEventServerStart fails */
driversInitialized = false;
virStateCleanup();
}
virObjectUnref(adminProgram);
virObjectUnref(srvAdm); virObjectUnref(srvAdm);
virObjectUnref(qemuProgram);
virObjectUnref(lxcProgram);
virObjectUnref(remoteProgram);
virObjectUnref(srv);
virObjectUnref(dmn);
virNetlinkShutdown(); virNetlinkShutdown();
if (pid_file_fd != -1)
virPidFileReleasePath(pid_file, pid_file_fd);
VIR_FREE(run_dir);
if (statuswrite != -1) { if (statuswrite != -1) {
if (ret != 0) { if (ret != 0) {
/* Tell parent of daemon what failed */ /* Tell parent of daemon what failed */
@ -1522,25 +1540,15 @@ int main(int argc, char **argv) {
} }
VIR_FORCE_CLOSE(statuswrite); VIR_FORCE_CLOSE(statuswrite);
} }
if (pid_file_fd != -1)
virPidFileReleasePath(pid_file, pid_file_fd);
VIR_FREE(sock_file); VIR_FREE(sock_file);
VIR_FREE(sock_file_ro); VIR_FREE(sock_file_ro);
VIR_FREE(sock_file_adm); VIR_FREE(sock_file_adm);
VIR_FREE(pid_file); VIR_FREE(pid_file);
VIR_FREE(remote_config_file); VIR_FREE(remote_config_file);
VIR_FREE(run_dir);
daemonConfigFree(config); daemonConfigFree(config);
if (driversInitialized) {
driversInitialized = false;
virStateCleanup();
}
/* Now that the hypervisor shutdown inhibition functions that use
* 'dmn' as a parameter are done, we can finally unref 'dmn' */
virObjectUnref(dmn);
return ret; return ret;
} }