shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

units: increase watchdog timeout to 3min for all our services

Browse Source 
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.
This commit is contained in:
Lennart Poettering 2015-09-23 17:27:39 +02:00
parent 31021ba085
commit c2fc2c2560
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
units/systemd-hostnamed.service.in
View File

@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
ExecStart=@rootlibexecdir@/systemd-hostnamed ExecStart=@rootlibexecdir@/systemd-hostnamed
BusName=org.freedesktop.hostname1 BusName=org.freedesktop.hostname1
CapabilityBoundingSet=CAP_SYS_ADMIN CapabilityBoundingSet=CAP_SYS_ADMIN
WatchdogSec=1min WatchdogSec=3min
PrivateTmp=yes PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
PrivateNetwork=yes PrivateNetwork=yes

2
units/systemd-importd.service.in
View File

@ -14,5 +14,5 @@ ExecStart=@rootlibexecdir@/systemd-importd
BusName=org.freedesktop.import1 BusName=org.freedesktop.import1
CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE
NoNewPrivileges=yes NoNewPrivileges=yes
WatchdogSec=1min WatchdogSec=3min
KillMode=mixed KillMode=mixed

2
units/systemd-journal-remote.service.in
View File

@ -18,7 +18,7 @@ Group=systemd-journal-remote
PrivateTmp=yes PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
PrivateNetwork=yes PrivateNetwork=yes
WatchdogSec=10min WatchdogSec=3min
[Install] [Install]
Also=systemd-journal-remote.socket Also=systemd-journal-remote.socket

2
units/systemd-journal-upload.service.in
View File

@ -15,7 +15,7 @@ ExecStart=@rootlibexecdir@/systemd-journal-upload \
User=systemd-journal-upload User=systemd-journal-upload
PrivateTmp=yes PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
WatchdogSec=20min WatchdogSec=3min
# If there are many split up journal files we need a lot of fds to # If there are many split up journal files we need a lot of fds to
# access them all and combine # access them all and combine

2
units/systemd-journald.service.in
View File

@ -22,7 +22,7 @@ RestartSec=0
NotifyAccess=all NotifyAccess=all
StandardOutput=null 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 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 FileDescriptorStoreMax=1024
# Increase the default a bit in order to allow many simultaneous # Increase the default a bit in order to allow many simultaneous

2
units/systemd-localed.service.in
View File

@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
ExecStart=@rootlibexecdir@/systemd-localed ExecStart=@rootlibexecdir@/systemd-localed
BusName=org.freedesktop.locale1 BusName=org.freedesktop.locale1
CapabilityBoundingSet= CapabilityBoundingSet=
WatchdogSec=1min WatchdogSec=3min
PrivateTmp=yes PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
PrivateNetwork=yes PrivateNetwork=yes

2
units/systemd-logind.service.in
View File

@ -24,7 +24,7 @@ Restart=always
RestartSec=0 RestartSec=0
BusName=org.freedesktop.login1 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 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 # Increase the default a bit in order to allow many simultaneous
# logins since we keep one fd open per session. # logins since we keep one fd open per session.

2
units/systemd-machined.service.in
View File

@ -16,7 +16,7 @@ After=machine.slice
ExecStart=@rootlibexecdir@/systemd-machined ExecStart=@rootlibexecdir@/systemd-machined
BusName=org.freedesktop.machine1 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 CAP_CHOWN CAP_FOWNER CAP_FSETID CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID
WatchdogSec=1min WatchdogSec=3min
# Note that machined cannot be placed in a mount namespace, since it # 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 # needs access to the host's mount namespace in order to implement the

2
units/systemd-networkd.service.m4.in
View File

@ -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 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 ProtectSystem=full
ProtectHome=yes ProtectHome=yes
WatchdogSec=1min WatchdogSec=3min
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
units/systemd-resolved.service.m4.in
View File

@ -23,7 +23,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
ProtectSystem=full ProtectSystem=full
ProtectHome=yes ProtectHome=yes
WatchdogSec=1min WatchdogSec=3min
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
units/systemd-timedated.service.in
View File

@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
ExecStart=@rootlibexecdir@/systemd-timedated ExecStart=@rootlibexecdir@/systemd-timedated
BusName=org.freedesktop.timedate1 BusName=org.freedesktop.timedate1
CapabilityBoundingSet=CAP_SYS_TIME CapabilityBoundingSet=CAP_SYS_TIME
WatchdogSec=1min WatchdogSec=3min
PrivateTmp=yes PrivateTmp=yes
ProtectSystem=yes ProtectSystem=yes
ProtectHome=yes ProtectHome=yes

2
units/systemd-timesyncd.service.in
View File

@ -27,7 +27,7 @@ PrivateTmp=yes
PrivateDevices=yes PrivateDevices=yes
ProtectSystem=full ProtectSystem=full
ProtectHome=yes ProtectHome=yes
WatchdogSec=1min WatchdogSec=3min
[Install] [Install]
WantedBy=sysinit.target WantedBy=sysinit.target

2
units/systemd-udevd.service.in
View File

@ -23,4 +23,4 @@ RestartSec=0
ExecStart=@rootlibexecdir@/systemd-udevd ExecStart=@rootlibexecdir@/systemd-udevd
MountFlags=slave MountFlags=slave
KillMode=mixed KillMode=mixed
WatchdogSec=1min WatchdogSec=3min