kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon_tools: Improve systemctl start error handling

Browse Source 
This fixes the same issue as in commit 82c8148983 ("cpuplugd: Improve
systemctl start error handling") for mon_tools (mon_procd and mon_fsstatd).

Currently "systemctl start mon_procd/fsstatd" does not report any errors
in case the startup fails.

Example (with mon_procd):

 (change interval in /etc/sysconfig/mon_procd to an invalid value "abc")
 # systemctl start mon_procd

The reason is that for type=simple systemd forks/execs mon_procd and if
that is successful immediately returns. There is no way to find out if the
initial startup fails.

Fix this by using type=fork and running the process in the background. In
this case systemd waits until the initial process returns.

In addition use PIDFile and ensure that the pid file is already available
when the initial process returns. To achieve this, use startup
synchronization via pipe. Without that systemd would print the following
warning:

systemd[1]: mon_procd.service: PID file /var/run/mon_procd.pid not readable
            (yet?) after start: No such file or directory

With this patch, an early startup error like in the example above, is now
reported correctly in "systemctl start":

 # systemctl start mon_procd
   Job for mon_procd.service failed because the control process exited...
   See "systemctl status mon_procd.service" and "journalctl -xe" for ...
 # journalctl -xe | grep mon_procd
   mon_procd[3184]: Error: Invalid interval (needs to be greater than 0)

Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
This commit is contained in:
Gerald Schaefer
2017-11-20 18:21:29 +01:00
committed by Michael Holzheu
parent 82c8148983
commit 780133f825
4 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
systemd/mon_fsstatd.service.in
View File

@@ -30,10 +30,11 @@ EnvironmentFile=@sysconf_path@/sysconfig/mon_fsstatd
ExecStartPre=-/sbin/modprobe monwriter
ExecStartPre=/sbin/udevadm settle --timeout=10
ExecStart=@usrsbin_path@/mon_fsstatd -a -i $FSSTAT_INTERVAL
ExecStart=@usrsbin_path@/mon_fsstatd -i $FSSTAT_INTERVAL
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Type=simple
Type=forking
PIDFile=/var/run/mon_fsstatd.pid
[Install]
WantedBy=multi-user.target

5
systemd/mon_procd.service.in
View File

@@ -30,10 +30,11 @@ EnvironmentFile=@sysconf_path@/sysconfig/mon_procd
ExecStartPre=-/sbin/modprobe monwriter
ExecStartPre=/sbin/udevadm settle --timeout=10
ExecStart=@usrsbin_path@/mon_procd -a -i $PROC_INTERVAL
ExecStart=@usrsbin_path@/mon_procd -i $PROC_INTERVAL
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Type=simple
Type=forking
PIDFile=/var/run/mon_procd.pid
[Install]
WantedBy=multi-user.target