diff options
| author | Axel Schwenke <axel@mariadb.com> | 2019-12-04 14:28:13 +0100 |
|---|---|---|
| committer | Axel Schwenke <axel@mariadb.com> | 2019-12-04 14:28:13 +0100 |
| commit | c5dafca87e8684749500708c6b83e9e2dae5b429 (patch) | |
| tree | 1f40143e92c9e1777252e8b9639faf363006852c | |
| parent | 05e72a33331bd9ad96ebbe4c844b94f0a5fb7390 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-17571.tar.gz | |
MDEV-17571 Make systemd timeout behavior more compatible with long Galera SSTsbb-10.1-MDEV-17571
Set an explicit start and stop timeout of 900 seconds for the
MariaDB Server systemd service
| -rw-r--r-- | support-files/mariadb.service.in | 7 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 7 |
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 |