summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-23 07:14:51 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-23 07:14:51 +0200
commit73985d83014e2a484dffac135193a2f0cf715b54 (patch)
tree7167799ebc178519babd7000c76234665a9d6030 /support-files
parent496532b5c54d69e012f6fc2417e97d61465588f2 (diff)
parentaade6e53d398dd287ca7e771191c9975099b4fa1 (diff)
downloadmariadb-git-73985d83014e2a484dffac135193a2f0cf715b54.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mariadb.service.in7
-rw-r--r--support-files/mariadb@.service.in7
2 files changed, 14 insertions, 0 deletions
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index e7976a8f3e2..1fc2527322c 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -128,6 +128,13 @@ UMask=007
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
PrivateTmp=false
+# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
+# this is the same value as used in SysV init scripts in the past
+# Galera might need a longer timeout, check the KB if you want to change this:
+# https://mariadb.com/kb/en/library/systemd/#configuring-the-systemd-service-timeout
+TimeoutStartSec=900
+TimeoutStopSec=900
+
##
## Options previously available to be set via [mysqld_safe]
## that now needs to be set by systemd config files as mysqld_safe
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 7a79a143778..15d640a2c7e 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -154,6 +154,13 @@ UMask=007
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
PrivateTmp=false
+# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
+# this is the same value as used in SysV init scripts in the past
+# if you need a longer timeout, check the KB:
+# https://mariadb.com/kb/en/library/systemd/#configuring-the-systemd-service-timeout
+TimeoutStartSec=900
+TimeoutStopSec=900
+
##
## Options previously available to be set via [mysqld_safe]
## that now needs to be set by systemd config files as mysqld_safe