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