shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00
Code

core: in containers, don't wait for cgroup empty notifications which will never come

Browse Source
This commit is contained in:
Lennart Poettering 2014-01-29 20:12:18 +01:00
parent 6294b8a92d
commit bc6aed7b8b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/unit.c
View File

@ -50,6 +50,7 @@
#include "bus-errors.h"
#include "dbus.h"
#include "execute.h"
#include "virt.h"
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,
@ -2921,7 +2922,7 @@ int unit_kill_context(
pid_t control_pid,
bool main_pid_alien) {
int sig, wait_for_exit = 0, r;
int sig, wait_for_exit = false, r;
assert(u);
assert(c);
@ -2940,7 +2941,8 @@ int unit_kill_context(
log_warning_unit(u->id, "Failed to kill main process " PID_FMT " (%s): %s", main_pid, strna(comm), strerror(-r));
} else {
wait_for_exit = !main_pid_alien;
if (!main_pid_alien)
wait_for_exit = true;
if (c->send_sighup)
kill(main_pid, SIGHUP);
@ -2976,7 +2978,16 @@ int unit_kill_context(
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r));
} else if (r > 0) {
wait_for_exit = true;
/* FIXME: Now, this is a terrible hack: in
* containers cgroup empty notifications don't
* work. Hence we'll not wait for them to run
* empty for now, since there is no way to
* detect when a service ends with no main PID
* known... */
if (detect_container(NULL) <= 0)
wait_for_exit = true;
if (c->send_sighup) {
set_free(pid_set);