summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorAxel Schwenke <axel@mariadb.com>2019-12-04 14:28:13 +0100
committerAxel Schwenke <axel@mariadb.com>2019-12-05 10:36:20 +0100
commitd78f02d73d5b2f962c0ea6a1198e932c7355adc2 (patch)
tree4c073b98f5878ff91fdba3d9a04818c81e131ed0 /support-files
parent3efbb5a16961a53299145075ad8312a514302afa (diff)
downloadmariadb-git-d78f02d73d5b2f962c0ea6a1198e932c7355adc2.tar.gz
MDEV-17571 Make systemd timeout behavior more compatible with long Galera SSTs
Set an explicit start and stop timeout of 900 seconds for the MariaDB Server systemd service
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 ef9fa5c2a22..ede97c04112 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -120,6 +120,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 8afae3bd09b..1f84b582e4e 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -141,6 +141,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