From 30ede25863d0148a9bc01a8657a15c8acf97e76e Mon Sep 17 00:00:00 2001 From: Andrea Mennillo Date: Tue, 22 Sep 2020 20:06:21 +0200 Subject: [PATCH] Add support for mariadbd binary Starting with MariaDB 10.5.2 the binary is named mariadbd Reference: https://jira.mariadb.org/browse/MDEV-21303 --- amplify/ext/mysql/managers.py | 4 ++-- amplify/ext/mysql/util.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amplify/ext/mysql/managers.py b/amplify/ext/mysql/managers.py index a2151e4..2873a88 100644 --- a/amplify/ext/mysql/managers.py +++ b/amplify/ext/mysql/managers.py @@ -174,7 +174,7 @@ def _find_local(ps=None): # break processing returning a fault-tolerant empty list return [] - if not any('mysqld' in line for line in ps): + if not any('mysqld' or 'mariadbd' in line for line in ps): context.log.info('no mysqld processes found') # break processing returning a fault-tolerant empty list @@ -193,7 +193,7 @@ def _find_local(ps=None): pid, ppid, cmd = parsed # unpack values # match master process - if cmd.split(' ', 1)[0].endswith('mysqld'): + if cmd.split(' ', 1)[0].endswith('d'): if not launch_method_supported("mysql", ppid): continue diff --git a/amplify/ext/mysql/util.py b/amplify/ext/mysql/util.py index 53e7fe6..314b17b 100644 --- a/amplify/ext/mysql/util.py +++ b/amplify/ext/mysql/util.py @@ -12,7 +12,7 @@ __email__ = "dedm@nginx.com" -PS_CMD = "ps xao pid,ppid,command | grep -E 'mysqld( |$)'" # grep -P doesn't work on BSD systems +PS_CMD = "ps xao pid,ppid,command | grep -E '(mariadb|mysql)d( |$)'" # grep -P doesn't work on BSD systems PS_REGEX = re.compile(r'\s*(?P\d+)\s+(?P\d+)\s+(?P.+)\s*') LS_CMD = "ls -la /proc/%s/exe"