richardphibel / rpms / systemd

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