f8f052
From efe0b569cdf0633968870042283a2b4a4b60de38 Mon Sep 17 00:00:00 2001
f8f052
From: Lennart Poettering <lennart@poettering.net>
f8f052
Date: Wed, 23 Sep 2015 17:27:39 +0200
f8f052
Subject: [PATCH 1/5] units: increase watchdog timeout to 3min for all our
f8f052
 services
f8f052
f8f052
Apparently, disk IO issues are more frequent than we hope, and 1min
f8f052
waiting for disk IO happens, so let's increase the watchdog timeout a
f8f052
bit, for all our services.
f8f052
f8f052
See #1353 for an example where this triggers.
f8f052
f8f052
(cherry picked from commit c2fc2c2560f0ca0fab383753c065e45d76f465e5)
f8f052
f8f052
jsynacek: I would say "Resolves: #1300212" here, but recent reports
f8f052
(see bugs 1301433, 1301434, 1301435, 1301436, 1301437) against rawhide
f8f052
(F24) seem to be caused by the same issue, yet the timeout is already
f8f052
set to 3 minutes.
f8f052
---
f8f052
 units/systemd-hostnamed.service.in      | 2 +-
f8f052
 units/systemd-importd.service.in        | 2 +-
f8f052
 units/systemd-journal-remote.service.in | 2 +-
f8f052
 units/systemd-journal-upload.service.in | 2 +-
f8f052
 units/systemd-journald.service.in       | 2 +-
f8f052
 units/systemd-localed.service.in        | 2 +-
f8f052
 units/systemd-logind.service.in         | 2 +-
f8f052
 units/systemd-machined.service.in       | 2 +-
f8f052
 units/systemd-networkd.service.m4.in    | 2 +-
f8f052
 units/systemd-resolved.service.m4.in    | 2 +-
f8f052
 units/systemd-timedated.service.in      | 2 +-
f8f052
 units/systemd-timesyncd.service.in      | 2 +-
f8f052
 units/systemd-udevd.service.in          | 2 +-
f8f052
 13 files changed, 13 insertions(+), 13 deletions(-)
f8f052
f8f052
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
f8f052
index cc88ecd..b7079e4 100644
f8f052
--- a/units/systemd-hostnamed.service.in
f8f052
+++ b/units/systemd-hostnamed.service.in
f8f052
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
f8f052
 ExecStart=@rootlibexecdir@/systemd-hostnamed
f8f052
 BusName=org.freedesktop.hostname1
f8f052
 CapabilityBoundingSet=CAP_SYS_ADMIN
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 PrivateTmp=yes
f8f052
 PrivateDevices=yes
f8f052
 PrivateNetwork=yes
f8f052
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
f8f052
index 403f153..d3238cf 100644
f8f052
--- a/units/systemd-importd.service.in
f8f052
+++ b/units/systemd-importd.service.in
f8f052
@@ -14,5 +14,5 @@ ExecStart=@rootlibexecdir@/systemd-importd
f8f052
 BusName=org.freedesktop.import1
f8f052
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE
f8f052
 NoNewPrivileges=yes
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 KillMode=mixed
f8f052
diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in
f8f052
index 4a898d6..2928a23 100644
f8f052
--- a/units/systemd-journal-remote.service.in
f8f052
+++ b/units/systemd-journal-remote.service.in
f8f052
@@ -18,7 +18,7 @@ Group=systemd-journal-remote
f8f052
 PrivateTmp=yes
f8f052
 PrivateDevices=yes
f8f052
 PrivateNetwork=yes
f8f052
-WatchdogSec=10min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 [Install]
f8f052
 Also=systemd-journal-remote.socket
f8f052
diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in
f8f052
index b2e3c76..a757673 100644
f8f052
--- a/units/systemd-journal-upload.service.in
f8f052
+++ b/units/systemd-journal-upload.service.in
f8f052
@@ -15,7 +15,7 @@ ExecStart=@rootlibexecdir@/systemd-journal-upload \
f8f052
 User=systemd-journal-upload
f8f052
 PrivateTmp=yes
f8f052
 PrivateDevices=yes
f8f052
-WatchdogSec=20min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 # If there are many split up journal files we need a lot of fds to
f8f052
 # access them all and combine
f8f052
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
f8f052
index a3540c6..41bfde5 100644
f8f052
--- a/units/systemd-journald.service.in
f8f052
+++ b/units/systemd-journald.service.in
f8f052
@@ -22,7 +22,7 @@ RestartSec=0
f8f052
 NotifyAccess=all
f8f052
 StandardOutput=null
f8f052
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 FileDescriptorStoreMax=1024
f8f052
 
f8f052
 # Increase the default a bit in order to allow many simultaneous
f8f052
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
f8f052
index bfa0978..9b13f90 100644
f8f052
--- a/units/systemd-localed.service.in
f8f052
+++ b/units/systemd-localed.service.in
f8f052
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
f8f052
 ExecStart=@rootlibexecdir@/systemd-localed
f8f052
 BusName=org.freedesktop.locale1
f8f052
 CapabilityBoundingSet=
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 PrivateTmp=yes
f8f052
 PrivateDevices=yes
f8f052
 PrivateNetwork=yes
f8f052
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
f8f052
index f087e99..ff04913 100644
f8f052
--- a/units/systemd-logind.service.in
f8f052
+++ b/units/systemd-logind.service.in
f8f052
@@ -24,7 +24,7 @@ Restart=always
f8f052
 RestartSec=0
f8f052
 BusName=org.freedesktop.login1
f8f052
 CapabilityBoundingSet=CAP_SYS_ADMIN CAP_MAC_ADMIN CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 # Increase the default a bit in order to allow many simultaneous
f8f052
 # logins since we keep one fd open per session.
f8f052
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
f8f052
index 19c3395..eddbe1d 100644
f8f052
--- a/units/systemd-machined.service.in
f8f052
+++ b/units/systemd-machined.service.in
f8f052
@@ -16,7 +16,7 @@ After=machine.slice
f8f052
 ExecStart=@rootlibexecdir@/systemd-machined
f8f052
 BusName=org.freedesktop.machine1
f8f052
 CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 # Note that machined cannot be placed in a mount namespace, since it
f8f052
 # needs access to the host's mount namespace in order to implement the
f8f052
diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in
f8f052
index 64d9130..b7c633b 100644
f8f052
--- a/units/systemd-networkd.service.m4.in
f8f052
+++ b/units/systemd-networkd.service.m4.in
f8f052
@@ -30,7 +30,7 @@ ExecStart=@rootlibexecdir@/systemd-networkd
f8f052
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
f8f052
 ProtectSystem=full
f8f052
 ProtectHome=yes
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 [Install]
f8f052
 WantedBy=multi-user.target
f8f052
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
f8f052
index dce5402..c674b27 100644
f8f052
--- a/units/systemd-resolved.service.m4.in
f8f052
+++ b/units/systemd-resolved.service.m4.in
f8f052
@@ -23,7 +23,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
f8f052
 CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
f8f052
 ProtectSystem=full
f8f052
 ProtectHome=yes
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 [Install]
f8f052
 WantedBy=multi-user.target
f8f052
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
f8f052
index fe5ccb4..0c9599d 100644
f8f052
--- a/units/systemd-timedated.service.in
f8f052
+++ b/units/systemd-timedated.service.in
f8f052
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
f8f052
 ExecStart=@rootlibexecdir@/systemd-timedated
f8f052
 BusName=org.freedesktop.timedate1
f8f052
 CapabilityBoundingSet=CAP_SYS_TIME
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 PrivateTmp=yes
f8f052
 ProtectSystem=yes
f8f052
 ProtectHome=yes
f8f052
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
f8f052
index 8219c95..a856dad 100644
f8f052
--- a/units/systemd-timesyncd.service.in
f8f052
+++ b/units/systemd-timesyncd.service.in
f8f052
@@ -27,7 +27,7 @@ PrivateTmp=yes
f8f052
 PrivateDevices=yes
f8f052
 ProtectSystem=full
f8f052
 ProtectHome=yes
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
 
f8f052
 [Install]
f8f052
 WantedBy=sysinit.target
f8f052
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
f8f052
index e7216d6..79f28c8 100644
f8f052
--- a/units/systemd-udevd.service.in
f8f052
+++ b/units/systemd-udevd.service.in
f8f052
@@ -23,4 +23,4 @@ RestartSec=0
f8f052
 ExecStart=@rootlibexecdir@/systemd-udevd
f8f052
 MountFlags=slave
f8f052
 KillMode=mixed
f8f052
-WatchdogSec=1min
f8f052
+WatchdogSec=3min
f8f052
-- 
f8f052
2.5.0
f8f052