MDEV-36009: Systemd: Restart on OOM

Per https://github.com/systemd/systemd/issues/36529 OOM counts
as a on-abnormal condition. To ensure that MariaDB testart on
OOM the Restart is changes to on-abnormal which an extension
on the current on-abort condition.

(cherry-picked from 839828e57fdf734b15c81cb9cb76d3760a9161f1)

Closes Debian Bug#1073847.

Forwarded: https://github.com/MariaDB/server/pull/3611

Gbp-Pq: Name MDEV-36009-Systemd-Restart-on-OOM.patch

diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 0aa157d930a2191123615617b7f40b00b98c3a17..3c16a46c374aa0dbc50e7700048831b4f26cff93 100644 (file)
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -108,7 +108,7 @@ SendSIGKILL=no
 
 # Restart crashed server only, on-failure would also restart, for example, when
 # my.cnf contains unknown option
-Restart=on-abort
+Restart=on-abnormal
 RestartSec=5s
 
 UMask=007

diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 31f1586f1bf3a28f78d58733060c289212e8550f..0c5372ce1c2b2baa4340febb83133ff5873c62a3 100644 (file)
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -219,7 +219,7 @@ SendSIGKILL=no
 
 # Restart crashed server only, on-failure would also restart, for example, when
 # my.cnf contains unknown option
-Restart=on-abort
+Restart=on-abnormal
 RestartSec=5s
 
 UMask=007