systemctl: emit warning when we get an invalid process entry from pid1 and continue

Output looks like this:
Invalid process description in GetUnitProcesses reply: cgroup="machine.slice/machine-rawhide.scope/payload/system.slice/systemd-journald.service" pid=638367 command="/usr/lib/systemd/systemd-journald", ignoring: Invalid argument

diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
index aeba2ebfd399ea1a9be14c070acbb862fc6e1104..054a1410acc564a7066ca3bd682b99d4d3e6e809 100644 (file)
--- a/src/shared/bus-unit-procs.c
+++ b/src/shared/bus-unit-procs.c
@@ -387,8 +387,11 @@ int unit_show_processes(
                         break;
 
                 r = add_process(cgroups, path, pid, name);
-                if (r < 0)
+                if (r == -ENOMEM)
                         goto finish;
+                if (r < 0)
+                        log_warning_errno(r, "Invalid process description in GetUnitProcesses reply: cgroup=\"%s\" pid="PID_FMT" command=\"%s\", ignoring: %m",
+                                          path, pid, name);
         }
 
         r = sd_bus_message_exit_container(reply);

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0305f6119418cbfe9b468015ed798de6e21d72ba..162650ec90f0ed31f05b240d71dce6fbc69a7b01 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4548,7 +4548,8 @@ static void print_status_info(
 
                         show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, i->control_group, prefix, c, extra, k, get_output_flags());
                 } else if (r < 0)
-                        log_warning_errno(r, "Failed to dump process list for '%s', ignoring: %s", i->id, bus_error_message(&error, r));
+                        log_warning_errno(r, "Failed to dump process list for '%s', ignoring: %s",
+                                          i->id, bus_error_message(&error, r));
         }
 
         if (i->id && arg_transport == BUS_TRANSPORT_LOCAL)