[389-commits] [389-ds-base] 01/03: Ticket 49138 - Increase systemd timout

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch master
in repository 389-ds-base.

commit 37fc94768f83ce5c77a47a150952a60ea0cdc3ef
Author: William Brown <firstyear(a)redhat.com&gt;
Date:   Tue Feb 21 12:39:34 2017 +1000

    Ticket 49138 - Increase systemd timout
    
    Bug Description:  We encountered a case where the system timeout
    was too aggresive during encrypted changelog replay. This would
    cause DB corruption as systemd killed us.
    
    Fix Description:  Make the timeout infinite to prevent systemd
    killing us.
    
    https://pagure.io/389-ds-base/issue/49138
    
    Author: wibrown
    
    Review by: mreynolds (Thanks!)
---
 wrappers/systemd.template.asan.service.in | 3 +++
 wrappers/systemd.template.service.in      | 3 +++
 wrappers/systemd.template.sysconfig       | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wrappers/systemd.template.asan.service.in
b/wrappers/systemd.template.asan.service.in
index cfde3b5..0fe0bad 100644
--- a/wrappers/systemd.template.asan.service.in
+++ b/wrappers/systemd.template.asan.service.in
@@ -19,6 +19,9 @@ After=chronyd.service ntpd.service network-online.target syslog.target
 
 [Service]
 Type=notify
+NotifyAccess=all
+TimeoutStartSec=0
+TimeoutStopSec=600
 EnvironmentFile=@initconfigdir@/@package_name@
 EnvironmentFile=@initconfigdir@/@package_name@-%i
 PIDFile=@localstatedir@/run/@package_name(a)/slapd-%i.pid
diff --git a/wrappers/systemd.template.service.in b/wrappers/systemd.template.service.in
index 6f096b7..75a1c75 100644
--- a/wrappers/systemd.template.service.in
+++ b/wrappers/systemd.template.service.in
@@ -19,6 +19,9 @@ After=chronyd.service ntpd.service network-online.target syslog.target
 
 [Service]
 Type=notify
+NotifyAccess=all
+TimeoutStartSec=0
+TimeoutStopSec=600
 EnvironmentFile=@initconfigdir@/@package_name@
 EnvironmentFile=@initconfigdir@/@package_name@-%i
 PIDFile=@localstatedir@/run/@package_name(a)/slapd-%i.pid
diff --git a/wrappers/systemd.template.sysconfig b/wrappers/systemd.template.sysconfig
index e653c86..d78cc06 100644
--- a/wrappers/systemd.template.sysconfig
+++ b/wrappers/systemd.template.sysconfig
@@ -1,6 +1,4 @@
 [Service]
-TimeoutStartSec=10m
-NotifyAccess=all
 
 # uncomment this line to raise the file descriptor limit
 # LimitNOFILE=8192

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.