core: do an extra check if oom was triggered when handling sigchild

Should fix #12425.
2019-05-20 16:37:06 +02:00
parent 569554d9e5
commit 2ba6ae6b2b
3 changed files with 8 additions and 2 deletions
@@ -2524,8 +2524,13 @@ static int manager_dispatch_sigchld(sd_event_source *source, void *userdata) {
                /* Finally, execute them all. Note that u1, u2 and the array might contain duplicates, but
                 * that's fine, manager_invoke_sigchld_event() will ensure we only invoke the handlers once for
                 * each iteration. */
-                if (u1)
+                if (u1) {
+                        /* We check for oom condition, in case we got SIGCHLD before the oom notification.
+                         * We only do this for the cgroup the PID belonged to. */
+                        (void) unit_check_oom(u1);
+
                        manager_invoke_sigchld_event(m, u1, &si);
+                }
                if (u2)
                        manager_invoke_sigchld_event(m, u2, &si);
                if (array_copy)