From a5b553ab99460f349ad5793c1d3877e6796c1ea4 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 23 Mar 2023 08:47:37 +0100
Subject: [PATCH] dump: global/per-base schema along with data

---
 client/lib/dump.sh | 83 ++++++++++++++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/client/lib/dump.sh b/client/lib/dump.sh
index 16e8b95..667576c 100644
--- a/client/lib/dump.sh
+++ b/client/lib/dump.sh
@@ -169,32 +169,29 @@ dump_mysql_global() {
     log "LOCAL_TASKS - stop  ${dump_file}"
 
     ## Schema only (no data) for each databases
-    databases=$(mysql_list_databases "${option_port}")
-    for database in ${databases}; do
-        local error_file="${errors_dir}/${database}.schema.err"
-        local dump_file="${dump_dir}/${database}.schema.sql"
-        log "LOCAL_TASKS - start ${dump_file}"
+    local error_file="${errors_dir}/mysqldump.schema.err"
+    local dump_file="${dump_dir}/mysqldump.schema.sql"
+    log "LOCAL_TASKS - start ${dump_file}"
 
-        declare -a options
-        options=()
-        options+=(--defaults-extra-file=/etc/mysql/debian.cnf)
-        options+=(--port="${option_port}")
-        options+=(--force)
-        options+=(--no-data)
-        options+=(--databases "${database}")
+    declare -a options
+    options=()
+    options+=(--defaults-extra-file=/etc/mysql/debian.cnf)
+    options+=(--port="${option_port}")
+    options+=(--force)
+    options+=(--no-data)
+    options+=(--all-databases)
 
-        mysqldump "${options[@]}" 2> "${error_file}" > "${dump_file}"
+    mysqldump "${options[@]}" 2> "${error_file}" > "${dump_file}"
 
-        local last_rc=$?
-        # shellcheck disable=SC2086
-        if [ ${last_rc} -ne 0 ]; then
-            log_error "LOCAL_TASKS - mysqldump to ${dump_file} returned an error ${last_rc}" "${error_file}"
-            GLOBAL_RC=${E_DUMPFAILED}
-        else
-            rm -f "${error_file}"
-        fi
-        log "LOCAL_TASKS - stop  ${dump_file}"
-    done
+    local last_rc=$?
+    # shellcheck disable=SC2086
+    if [ ${last_rc} -ne 0 ]; then
+        log_error "LOCAL_TASKS - mysqldump to ${dump_file} returned an error ${last_rc}" "${error_file}"
+        GLOBAL_RC=${E_DUMPFAILED}
+    else
+        rm -f "${error_file}"
+    fi
+    log "LOCAL_TASKS - stop  ${dump_file}"
 }
 
 #######################################################################
@@ -245,6 +242,12 @@ dump_mysql_per_base() {
         shift
     done
 
+    local dump_dir="${LOCAL_BACKUP_DIR}/mysql-per-base-${option_port}"
+    local errors_dir=$(errors_dir_from_dump_dir "${dump_dir}") 
+    rm -rf "${dump_dir}" "${errors_dir}"
+    # shellcheck disable=SC2174
+    mkdir -p -m 700 "${dump_dir}" "${errors_dir}"
+
     declare -a options
     options=()
     options+=(--defaults-extra-file=/etc/mysql/debian.cnf)
@@ -255,12 +258,6 @@ dump_mysql_per_base() {
 
     databases=$(mysql_list_databases "${option_port}")
     for database in ${databases}; do
-        local dump_dir="${LOCAL_BACKUP_DIR}/mysql-per-base-${option_port}"
-        local errors_dir=$(errors_dir_from_dump_dir "${dump_dir}") 
-        rm -rf "${dump_dir}" "${errors_dir}"
-        # shellcheck disable=SC2174
-        mkdir -p -m 700 "${dump_dir}" "${errors_dir}"
-
         local error_file="${errors_dir}/${database}.err"
         local dump_file="${dump_dir}/${database}.sql.gz"
         log "LOCAL_TASKS - start ${dump_file}"
@@ -277,6 +274,34 @@ dump_mysql_per_base() {
         fi
         log "LOCAL_TASKS - stop  ${dump_file}"
     done
+
+    ## Schema only (no data) for each databases
+    databases=$(mysql_list_databases "${option_port}")
+    for database in ${databases}; do
+        local error_file="${errors_dir}/${database}.schema.err"
+        local dump_file="${dump_dir}/${database}.schema.sql"
+        log "LOCAL_TASKS - start ${dump_file}"
+
+        declare -a options
+        options=()
+        options+=(--defaults-extra-file=/etc/mysql/debian.cnf)
+        options+=(--port="${option_port}")
+        options+=(--force)
+        options+=(--no-data)
+        options+=(--databases "${database}")
+
+        mysqldump "${options[@]}" 2> "${error_file}" > "${dump_file}"
+
+        local last_rc=$?
+        # shellcheck disable=SC2086
+        if [ ${last_rc} -ne 0 ]; then
+            log_error "LOCAL_TASKS - mysqldump to ${dump_file} returned an error ${last_rc}" "${error_file}"
+            GLOBAL_RC=${E_DUMPFAILED}
+        else
+            rm -f "${error_file}"
+        fi
+        log "LOCAL_TASKS - stop  ${dump_file}"
+    done
 }
 
 #######################################################################