提交 c8579871 编写于 作者: M Michal Privoznik

all: don't wait for driver lock during startup

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: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 3b9359cd
...@@ -761,7 +761,7 @@ networkStateInitialize(bool privileged, ...@@ -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() */
......
...@@ -296,7 +296,7 @@ storageStateInitialize(bool privileged, ...@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册