From 72944367e04e78648652f03416f3ff22d91e8d4a Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 22 Apr 2021 11:42:51 +1000 Subject: [PATCH] drop KillMode=process MariaDB-10.4 onwards included a pam_helper subprocess to help with the pam authentication module. If the user is running with Galera there are SST modules that could be executing. By dropping KillMode=process this reverts back to control-group to cover all of these subprocesses. This is what upstream does. https://jira.mariadb.org/browse/MDEV-25233 suggests moving to KillMode=mixed, which is probably ok too, but has been tested less. Cherry-picked from Fedora: https://src.fedoraproject.org/rpms/mariadb/c/95f558b8334ba7198d55b9f2445bea4375ded5f9?branch=rawhide Related: #1971248 --- mysql.service.in | 1 - mysql@.service.in | 1 - 2 files changed, 2 deletions(-) diff --git a/mysql.service.in b/mysql.service.in index 24e61cc..028e6d5 100644 --- a/mysql.service.in +++ b/mysql.service.in @@ -53,7 +53,6 @@ ExecStartPost=@libexecdir@/mariadb-check-upgrade # See also bind-address MariaDB option. PrivateNetwork=false -KillMode=process KillSignal=SIGTERM # Don't want to see an automated SIGKILL ever diff --git a/mysql@.service.in b/mysql@.service.in index f9b72fa..6e4039d 100644 --- a/mysql@.service.in +++ b/mysql@.service.in @@ -59,7 +59,6 @@ ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I # See also bind-address MariaDB option. PrivateNetwork=false -KillMode=process KillSignal=SIGTERM # Don't want to see an automated SIGKILL ever