SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: do not disconnect from bus when failed to install signal match

Browse Source 
If bus_add_match_full() is called without install callback and we failed
to install the signal match e.g. by timeout, then add_match_callback()
will disconnect from the bus.
Let's use a custom install handler and handle failures gracefully.

This does not *solve* the root cause of issue #30573, but should improve
the situation when the issue is triggered.
This commit is contained in:
Yu Watanabe
2024-12-29 15:58:08 +09:00
parent 7baf4d234a
commit db6b214f95
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/unit.c
+28 -2
View File
@@ -3511,6 +3511,32 @@ int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {
return r;
}
static int signal_name_owner_changed_install_handler(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Unit *u = ASSERT_PTR(userdata);
const sd_bus_error *e;
int r;
e = sd_bus_message_get_error(message);
if (!e) {
log_unit_trace(u, "Successfully installed NameOwnerChanged signal match.");
return 0;
}
r = sd_bus_error_get_errno(e);
log_unit_error_errno(u, r,
"Unexpected error response on installing NameOwnerChanged signal match: %s",
bus_error_message(e, r));
/* If we failed to install NameOwnerChanged signal, also unref the bus slot of GetNameOwner(). */
u->match_bus_slot = sd_bus_slot_unref(u->match_bus_slot);
u->get_name_owner_slot = sd_bus_slot_unref(u->get_name_owner_slot);
if (UNIT_VTABLE(u)->bus_name_owner_change)
UNIT_VTABLE(u)->bus_name_owner_change(u, NULL);
return 0;
}
static int signal_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) {
const char *new_owner;
Unit *u = ASSERT_PTR(userdata);
@@ -3593,10 +3619,10 @@ int unit_install_bus_match(Unit *u, sd_bus *bus, const char *name) {
r = bus_add_match_full(
bus,
&u->match_bus_slot,
true,
/* asynchronous = */ true,
match,
signal_name_owner_changed,
NULL,
signal_name_owner_changed_install_handler,
u,
timeout_usec);
if (r < 0)