diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-12-23 17:31:34 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2020-01-06 15:21:47 +0100 |
commit | fc67a943d989d5e74577adea9676cdc7928b08fc (patch) | |
tree | 805830f856b86e3edf538fbee71484a5d865882e /src/core/dbus.h | |
parent | core: create/remove unit bus name slots always together (diff) | |
download | systemd-fc67a943d989d5e74577adea9676cdc7928b08fc.tar.xz systemd-fc67a943d989d5e74577adea9676cdc7928b08fc.zip |
core: drop initial ListNames() bus call from PID 1
Previously, when first connecting to the bus after connecting to it we'd
issue a ListNames() bus call to the driver to figure out which bus names
are currently active. This information was then used to initialize the
initial state for services that use BusName=.
This change removes the whole code for this and replaces it with
something vastly simpler.
First of all, the ListNames() call was issues synchronosuly, which meant
if dbus was for some reason synchronously calling into PID1 for some
reason we'd deadlock. As it turns out there's now a good chance it does:
the nss-systemd userdb hookup means that any user dbus-daemon resolves
might result in a varlink call into PID 1, and dbus resolves quite a lot
of users while parsing its policy. My original goal was to fix this
deadlock.
But as it turns out we don't need the ListNames() call at all anymore,
since #12957 has been merged. That PR was supposed to fix a race where
asynchronous installation of bus matches would cause us missing the
initial owner of a bus name when a service is first started. It fixed it
(correctly) by enquiring with GetOwnerName() who currently owns the
name, right after installing the match. But this means whenever we start watching a bus name we anyway
issue a GetOwnerName() for it, and that means also when first connecting
to the bus we don't need to issue ListNames() anymore since that just
tells us the same info: which names are currently owned.
hence, let's drop ListNames() and instead make better use of the
GetOwnerName() result: if it failed the name is not owned.
Also, while we are at it, let's simplify the unit's owner_name_changed()
callback(): let's drop the "old_owner" argument. We never used that
besides logging, and it's hard to synthesize from just the return of a
GetOwnerName(), hence don't bother.
Diffstat (limited to 'src/core/dbus.h')
-rw-r--r-- | src/core/dbus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/dbus.h b/src/core/dbus.h index f1c0fa86c0..d5ba6537ea 100644 --- a/src/core/dbus.h +++ b/src/core/dbus.h @@ -21,8 +21,6 @@ int bus_fdset_add_all(Manager *m, FDSet *fds); void bus_track_serialize(sd_bus_track *t, FILE *f, const char *prefix); int bus_track_coldplug(Manager *m, sd_bus_track **t, bool recursive, char **l); -int manager_enqueue_sync_bus_names(Manager *m); - int bus_foreach_bus(Manager *m, sd_bus_track *subscribed2, int (*send_message)(sd_bus *bus, void *userdata), void *userdata); int bus_verify_manage_units_async(Manager *m, sd_bus_message *call, sd_bus_error *error); |