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

lib: autostart objects exactly once

https://bugzilla.redhat.com/show_bug.cgi?id=1755303

With the recent work in daemon split and socket activation
daemons can come and go. They can and will be started many times
during a session which results in objects being autostarted
multiple times. This is not optimal. Use
virDriverShouldAutostart() to determine if autostart should be
done or not.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 ee16a195
......@@ -1218,6 +1218,8 @@ bhyveStateInitialize(bool privileged,
virStateInhibitCallback callback ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED)
{
bool autostart = true;
if (!privileged) {
VIR_INFO("Not running privileged, disabling driver");
return VIR_DRV_STATE_INIT_SKIPPED;
......@@ -1301,6 +1303,10 @@ bhyveStateInitialize(bool privileged,
virBhyveProcessReconnectAll(bhyve_driver);
if (virDriverShouldAutostart(BHYVE_STATE_DIR, &autostart) < 0)
goto cleanup;
if (autostart)
bhyveAutostartDomains(bhyve_driver);
return VIR_DRV_STATE_INIT_COMPLETE;
......
......@@ -655,6 +655,7 @@ libxlStateInitialize(bool privileged,
libxlDriverConfigPtr cfg;
char *driverConf = NULL;
char ebuf[1024];
bool autostart = true;
if (!libxlDriverShouldLoad(privileged))
return VIR_DRV_STATE_INIT_SKIPPED;
......@@ -800,9 +801,14 @@ libxlStateInitialize(bool privileged,
NULL, NULL) < 0)
goto error;
if (virDriverShouldAutostart(cfg->stateDir, &autostart) < 0)
goto error;
if (autostart) {
virDomainObjListForEach(libxl_driver->domains, false,
libxlAutostartDomain,
libxl_driver);
}
virDomainObjListForEach(libxl_driver->domains, false,
libxlDomainManagedSaveLoad,
......
......@@ -1541,6 +1541,7 @@ static int lxcStateInitialize(bool privileged,
{
virCapsPtr caps = NULL;
virLXCDriverConfigPtr cfg = NULL;
bool autostart = true;
/* Check that the user is root, silently disable if not */
if (!privileged) {
......@@ -1630,6 +1631,10 @@ static int lxcStateInitialize(bool privileged,
NULL, NULL) < 0)
goto cleanup;
if (virDriverShouldAutostart(cfg->stateDir, &autostart) < 0)
goto cleanup;
if (autostart)
virLXCProcessAutostartAll(lxc_driver);
virObjectUnref(caps);
......
......@@ -715,6 +715,7 @@ networkStateInitialize(bool privileged,
int ret = VIR_DRV_STATE_INIT_ERROR;
char *configdir = NULL;
char *rundir = NULL;
bool autostart = true;
#ifdef WITH_FIREWALLD
DBusConnection *sysbus = NULL;
#endif
......@@ -815,9 +816,14 @@ networkStateInitialize(bool privileged,
networkReloadFirewallRules(network_driver, true);
networkRefreshDaemons(network_driver);
if (virDriverShouldAutostart(network_driver->stateDir, &autostart) < 0)
goto error;
if (autostart) {
virNetworkObjListForEach(network_driver->networks,
networkAutostartConfig,
network_driver);
}
network_driver->networkEventState = virObjectEventStateNew();
......
......@@ -673,6 +673,7 @@ qemuStateInitialize(bool privileged,
gid_t run_gid = -1;
char *hugepagePath = NULL;
char *memoryBackingPath = NULL;
bool autostart = true;
size_t i;
if (VIR_ALLOC(qemu_driver) < 0)
......@@ -1035,6 +1036,10 @@ qemuStateInitialize(bool privileged,
qemuProcessReconnectAll(qemu_driver);
if (virDriverShouldAutostart(cfg->stateDir, &autostart) < 0)
goto error;
if (autostart)
qemuAutostartDomains(qemu_driver);
return VIR_DRV_STATE_INIT_COMPLETE;
......
......@@ -258,6 +258,7 @@ storageStateInitialize(bool privileged,
{
VIR_AUTOFREE(char *) configdir = NULL;
VIR_AUTOFREE(char *) rundir = NULL;
bool autostart = true;
if (VIR_ALLOC(driver) < 0)
return VIR_DRV_STATE_INIT_ERROR;
......@@ -319,6 +320,10 @@ storageStateInitialize(bool privileged,
storagePoolUpdateAllState();
if (virDriverShouldAutostart(driver->stateDir, &autostart) < 0)
goto error;
if (autostart)
storageDriverAutostart();
driver->storageEventState = virObjectEventStateNew();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册