mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
journald: slightly bump OOM adjust for journald (#13366)
If logging disappears issues are hard to debug, hence let's give journald a slight edge over other services when the OOM killer hits. Here are the special adjustments we now make: systemd-coredump@.service.in OOMScoreAdjust=500 systemd-journald.service.in OOMScoreAdjust=-250 systemd-udevd.service.in OOMScoreAdjust=-1000 (i.e. the coredump processing is made more likely to be killed on OOM, and udevd and journald are less likely to be killed)
This commit is contained in:
parent
d0696f3b75
commit
2ec71e439f
2
TODO
2
TODO
@ -23,8 +23,6 @@ Features:
|
||||
may be used to mark a whole binary as non-coredumpable. Would fix:
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=69447
|
||||
|
||||
* adjust OOM score slightly for journald
|
||||
|
||||
* beef up hibernation to optionally do swapon/swapoff immediately before/after
|
||||
the hibernation
|
||||
|
||||
|
@ -508,7 +508,6 @@ int main(int argc, char *argv[]) {
|
||||
log_error_errno(errno, "Failed to execute shutdown binary: %m");
|
||||
} else
|
||||
log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
|
||||
|
||||
}
|
||||
|
||||
if (need_umount || need_swapoff || need_loop_detach || need_dm_detach)
|
||||
|
@ -16,6 +16,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a
|
||||
Before=sysinit.target
|
||||
|
||||
[Service]
|
||||
OOMScoreAdjust=-250
|
||||
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
|
||||
DeviceAllow=char-* rw
|
||||
ExecStart=@rootlibexecdir@/systemd-journald
|
||||
|
@ -17,6 +17,7 @@ ConditionPathIsReadWrite=/sys
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
# Note that udev also adjusts the OOM score internally and will reset the value internally for its workers
|
||||
OOMScoreAdjust=-1000
|
||||
Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
|
||||
Restart=always
|
||||
|
Loading…
Reference in New Issue
Block a user