Received-SPF: pass (google.com: domain of systemd-devel-bounces+arvidjaar=gmail.com@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177;
From: Olivier Brunel <jjk@jjacky.com>
To: systemd-devel@lists.freedesktop.org
Date: Fri, 20 Sep 2013 22:53:52 +0200
Message-Id: <1379710432-4195-1-git-send-email-jjk@jjacky.com>
Subject: [systemd-devel] [PATCH] Fix timeout when stopping Type=notify
	service
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: systemd-devel-bounces+arvidjaar=gmail.com@lists.freedesktop.org
Errors-To: systemd-devel-bounces+arvidjaar=gmail.com@lists.freedesktop.org

Since 41efeaec a call to service_unwatch_main_pid() is done from
service_set_main_pid(), which is called upon receiving message MAINPID=

This had the side effect of not watching pid anymore, and would result in a
useless timeout when stopping the service, as the unit wouldn't be identified
from the pid, so not marked stopped which would result in systemd thinking this
was a timeout.
---
I'm not exactly familiar with systemd's internals, so this might not be the
correct way to fix this, please correct me if it isn't.

 src/core/service.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Index: systemd-207/src/core/service.c
===================================================================
--- systemd-207.orig/src/core/service.c
+++ systemd-207/src/core/service.c
@@ -3461,9 +3461,17 @@ static void service_notify_message(Unit
                         log_warning_unit(u->id,
                                          "Failed to parse notification message %s", e);
                 else {
+                        int r;
+
                         log_debug_unit(u->id,
                                        "%s: got %s", u->id, e);
                         service_set_main_pid(s, pid);
+                        r = unit_watch_pid(u, pid);
+                        if (r < 0)
+                                /* FIXME: we need to do something here */
+                                log_warning_unit(u->id,
+                                                 "Failed to watch PID %lu from service %s",
+                                                 (unsigned long) pid, u->id);
                 }
         }