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

Merge pull request #27510 from poettering/notify-barrier-pid-1-tweaks

Browse Source 
pid 1 notify barrier handling tweaks
This commit is contained in:
Lennart Poettering
2023-05-03 18:21:14 +02:00
committed by GitHub
parent 09e766e70b 7b0a126751
commit ca71b1d966
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.c
+6 -5
View File
@@ -2525,11 +2525,10 @@ static bool manager_process_barrier_fd(char * const *tags, FDSet *fds) {
/* nothing else must be sent when using BARRIER=1 */
if (strv_contains(tags, "BARRIER=1")) {
if (strv_length(tags) == 1) {
if (fdset_size(fds) != 1)
log_warning("Got incorrect number of fds with BARRIER=1, closing them.");
} else
if (strv_length(tags) != 1)
log_warning("Extra notification messages sent with BARRIER=1, ignoring everything.");
else if (fdset_size(fds) != 1)
log_warning("Got incorrect number of fds with BARRIER=1, closing them.");
/* Drop the message if BARRIER=1 was found */
return true;
@@ -2673,8 +2672,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
}
/* Possibly a barrier fd, let's see. */
if (manager_process_barrier_fd(tags, fds))
if (manager_process_barrier_fd(tags, fds)) {
log_debug("Received barrier notification message from PID " PID_FMT ".", ucred->pid);
return 0;
}
/* Increase the generation counter used for filtering out duplicate unit invocations. */
m->notifygen++;