richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
dd65c9
From ad2d5449dc86ac37460ac9c16e0d5d088befbd0b Mon Sep 17 00:00:00 2001
dd65c9
From: Michal Sekletar <msekletar@users.noreply.github.com>
dd65c9
Date: Mon, 17 Jul 2017 10:04:37 +0200
dd65c9
Subject: [PATCH] journald: make sure we retain all stream fds across restarts
dd65c9
 (#6348)
dd65c9
dd65c9
Currently we set 4096 as maximum for number of stream connections that
dd65c9
we accept. However maximum number of file descriptors that systemd is
dd65c9
willing to accept from us is just 1024. This means we can't retain all
dd65c9
stream connections that we accepted. Hence bump the limit of fds in a
dd65c9
unit file so that systemd holds open all stream fds while we are
dd65c9
restarted.
dd65c9
dd65c9
New limit is set to 4224 (4096 + 128).
dd65c9
dd65c9
(cherry picked from commit 3c978aca69e0e43d4dd453437ec9c498ea788795)
dd65c9
dd65c9
Related: #1359939
dd65c9
---
dd65c9
 units/systemd-journald.service.in | 1 +
dd65c9
 1 file changed, 1 insertion(+)
dd65c9
dd65c9
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
c62b8e
index c85c349327..0d1ea61fe8 100644
dd65c9
--- a/units/systemd-journald.service.in
dd65c9
+++ b/units/systemd-journald.service.in
dd65c9
@@ -20,6 +20,7 @@ ExecStart=@rootlibexecdir@/systemd-journald
dd65c9
 Restart=always
dd65c9
 RestartSec=0
dd65c9
 StandardOutput=null
dd65c9
+FileDescriptorStoreMax=4224
dd65c9
 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
dd65c9
 WatchdogSec=3min
dd65c9