summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorDaniel Black <daniel@linux.vnet.ibm.com>2018-01-23 14:11:53 +1100
committerSergey Vojtovich <svoj@mariadb.org>2018-01-29 14:57:02 +0400
commitf9179b36d313ef50240407fcb2737ac3a0aa3b9e (patch)
tree0495631fcb9201e27aa53bc14c58b788dc50ef8e /support-files
parentac7610744a4e477d0e0b98e915dc43409c8b0997 (diff)
downloadmariadb-git-f9179b36d313ef50240407fcb2737ac3a0aa3b9e.tar.gz
systemd: revert to KillMode=control-group for galera
When galera is used we want a stop to kill off not only the mysqld process but the entire process group created by galera to perform sst or wsrep_notify_cmd.`
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mariadb.service.in1
-rw-r--r--support-files/mariadb@.service.in1
2 files changed, 0 insertions, 2 deletions
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index fe00f160d28..ef9fa5c2a22 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -87,7 +87,6 @@ ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITI
# Unset _WSREP_START_POSITION environment variable.
ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
-KillMode=process
KillSignal=SIGTERM
# Don't want to see an automated SIGKILL ever
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 000724d7fe2..465a0d94c62 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -108,7 +108,6 @@ ExecStart=@sbindir@/mysqld --defaults-file=@sysconf2dir@/my%I.cnf \
# Unset _WSREP_START_POSITION environment variable.
ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION%I"
-KillMode=process
KillSignal=SIGTERM
# Don't want to see an automated SIGKILL ever