Fix warnings about mysql legacy paths when using mariadb (#9)

* Fix warnings about mysql legacy paths going away when using mariadb

* Update tested versions

* Disable unrelated failures for now

Author: dale-c-anderson

.github/workflows/molecule.yml

@@ -27,11 +27,12 @@ jobs:
     strategy:
       matrix:
         image:
+          #- geerlingguy/docker-ubuntu2404-ansible:latest  @todo fix molecule/docker issues
+          #- geerlingguy/docker-ubuntu2204-ansible:latest  @todo fix molecule/docker issues
           - geerlingguy/docker-ubuntu2004-ansible:latest
-          - geerlingguy/docker-ubuntu1804-ansible:latest
-          - geerlingguy/docker-ubuntu1604-ansible:latest
-          - geerlingguy/docker-centos7-ansible:latest
           - geerlingguy/docker-centos8-ansible:latest
+          #- geerlingguy/docker-rockylinux9-ansible:latest  @todo fix molecule/docker issues
+          #- geerlingguy/docker-rockylinux10-ansible:latest  @todo fix molecule/docker issues
     steps:
       - name: checkout
         uses: actions/checkout@v2

README.md

@@ -120,6 +120,10 @@ Before a database is backed up, old backups are examined to see if they can be p
     - Ignore warnings about a specific database: `'^my_db_name$'`
     - Ignore warnings about two specific databases: `'^my_db_name$|^my_other_db$'`
 
+* #### simple_mysql_backups_prefer_mariadb_client
+  - Default: `true`
+  - If true, and if both `mysql` and `mariadb` clients are installed, the script will use the `mariadb` / `mariadb-dump` clients.
+  - If no mariadb client is installed, the script will fall back to `mysql` / `mysqldump` clients.
 
 ## Troubleshooting
 

defaults/main.yml

@@ -18,3 +18,5 @@ simple_mysql_backups_cron_hour: '4'
 simple_mysql_backups_cron_day: '*'
 simple_mysql_backups_cron_user: root
 simple_mysql_backups_cron_state: present
+
+simple_mysql_backups_prefer_mariadb_client: true

scripts/mysql-backups.conf.example

@@ -11,3 +11,4 @@ PRUNE_LOG="/var/log/acro/mysql-backups/prune.log"
 SPACE_ABORT_THRESHOLD=90
 NO_BACKUPS_FOR='^information_schema$|^performance_schema$|^sys$'
 IGNORE_EMPTY_DB_PATTERN='.*'
+PREFER_MARIADB_CLIENT=1

scripts/mysql-backups.sh

@@ -38,18 +38,33 @@ function main () {
   }
   export CONFIG
 
+  if [ "${PREFER_MARIADB_CLIENT:-1}" -eq 1 ] && command -v mariadb > /dev/null; then
+    MYSQL=$(command -v mariadb)
+  elif command -v mysql > /dev/null; then
+    MYSQL=$(command -v mysql)
+  else
+    err "Could not find mysql or mariadb client in path."
+    exit 1
+  fi
+
+  if [ "${PREFER_MARIADB_CLIENT:-1}" -eq 1 ] && command -v mariadb-dump > /dev/null; then
+    MYSQLDUMP=$(command -v mariadb-dump)
+  elif command -v mysqldump > /dev/null; then
+    MYSQLDUMP=$(command -v mysqldump)
+  else
+    err "Could not find mysqldump or mariadb-dump in path."
+    exit 1
+  fi
+
   if [ -n "${MY_DEFAULTS:-}" ]; then
     # Use a defaults file if one is specified
+    # The default behaviour is to read options from ~/.my.cnf without having to specify it.
     if [ ! -f "${MY_DEFAULTS}" ]; then
       err "MY_DEFAULTS is set to '${MY_DEFAULTS}', but that file does not exist."
       exit 1
     fi
-    MYSQL="$(command -v mysql) --defaults-file=${MY_DEFAULTS}"
-    MYSQLDUMP="$(command -v mysqldump) --defaults-file=${MY_DEFAULTS}"
-  else
-    # The default behaviour is to read options from ~/.my.cnf without having to specify it.
-    MYSQL="$(command -v mysql)"
-    MYSQLDUMP="$(command -v mysqldump)"
+    MYSQL="$MYSQL --defaults-file=${MY_DEFAULTS}"
+    MYSQLDUMP="$MYSQLDUMP --defaults-file=${MY_DEFAULTS}"
   fi
 
   # Touch the log file to make sure we can write to it.

templates/mysql-backups.conf.j2

@@ -15,3 +15,4 @@ PRUNE_LOG="{{ simple_mysql_backups_log_dir }}/prune.log"
 SPACE_ABORT_THRESHOLD={{ simple_mysql_backups_space_abort_threshold }}
 NO_BACKUPS_FOR='{{ simple_mysql_backups_skip_db_pattern }}'
 IGNORE_EMPTY_DB_PATTERN='{{ simple_mysql_backups_ignore_empty_db_pattern }}'
+PREFER_MARIADB_CLIENT={{ simple_mysql_backups_prefer_mariadb_client | ternary('1', '0') }}