[systemd-commits] 2 commits - src/core src/machine

[Lennart Poettering]

 src/core/unit.c             |   10 +++++++++-
 src/machine/machined-dbus.c |    8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 743970d2ea6d08aa7c7bff8220f6b7702f2b1db7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 7 16:12:09 2014 +0100

    core: one step back again, for nspawn we actually can't wait for cgroups running empty since systemd will get exactly zero notifications about it

diff --git a/src/core/unit.c b/src/core/unit.c
index b0bb026..1a8fdcb 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3103,7 +3103,15 @@ int unit_kill_context(
                                 log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r));
                 } else if (r > 0) {
 
-                        wait_for_exit = true;
+                        /* FIXME: For now, we will not wait for the
+                         * cgroup members to die, simply because
+                         * cgroup notification is unreliable. It
+                         * doesn't work at all in containers, and
+                         * outside of containers it can be confused
+                         * easily by leaving directories in the
+                         * cgroup. */
+
+                        /* wait_for_exit = true; */
 
                         if (c->send_sighup && !sigkill) {
                                 set_free(pid_set);

commit 4e05c4951aaaa57c9c6f3fb91723e7b93b1bbbda
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 7 15:44:10 2014 +0100

    machined: since we can now somewhat reliable get notifications for dying
    scopes we don't need to lower the stop timeout anymore

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 1087a1b..7c7293b 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -518,14 +518,6 @@ int manager_start_scope(
                         return r;
         }
 
-        /* cgroup empty notification is not available in containers
-         * currently. To make this less problematic, let's shorten the
-         * stop timeout for machines, so that we don't wait
-         * forever. */
-        r = sd_bus_message_append(m, "(sv)", "TimeoutStopUSec", "t", 500 * USEC_PER_MSEC);
-        if (r < 0)
-                return r;
-
         r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, pid);
         if (r < 0)
                 return r;