External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

all: don't wait for driver lock during startup

Browse Source 
There are two daemons that wait for acquiring their pid files:
virtnetworkd and virtstoraged. This is undesirable as the idea
is to quit early if unable to acquire the pid file.

Fixes: v5.6.0-rc1~207.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2019-11-26 15:28:22 +01:00
parent 3b9359cd44
commit c8579871a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/bridge_driver.c
View File

@ -761,7 +761,7 @@ networkStateInitialize(bool privileged,
if ((network_driver->lockFD = if ((network_driver->lockFD =
virPidFileAcquire(network_driver->stateDir, "driver", virPidFileAcquire(network_driver->stateDir, "driver",
true, getpid())) < 0) false, getpid())) < 0)
goto error; goto error;
/* if this fails now, it will be retried later with dnsmasqCapsRefresh() */ /* if this fails now, it will be retried later with dnsmasqCapsRefresh() */

2
src/storage/storage_driver.c
View File

@ -296,7 +296,7 @@ storageStateInitialize(bool privileged,
if ((driver->lockFD = if ((driver->lockFD =
virPidFileAcquire(driver->stateDir, "driver", virPidFileAcquire(driver->stateDir, "driver",
true, getpid())) < 0) false, getpid())) < 0)
goto error; goto error;
if (virStoragePoolObjLoadAllState(driver->pools, if (virStoragePoolObjLoadAllState(driver->pools,