factor our mariabackup to replace with mariadb-dump; many output improvements; etc

1 files changed, 117 insertions, 30 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index 5e18757..a7345dc 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -61,36 +61,44 @@ show_hostnames()
 
 check_db()
 {
-        show_hostnames
-        mariadb --skip-reconnect -t <<END
-select user(), @@hostname, @@server_id, @@gtid_slave_pos, @@sql_log_bin;
-END
+ls -lFC --color /var/lib/mysql
+mariadb -t "$@" <<.
+select
+        user()
+,       @@hostname
+,       @@server_id
+,       @@gtid_slave_pos
+,       @@sql_log_bin
+;
+select
+        @@hostname
+,       schema_name as 'database'
+from
+        information_schema.schemata
+;
+.
 }
 
 create_backup()
 {
+        mostly_silent_unless_error create_backup_verbose "$@"
+}
+
+create_backup_verbose()
+{
         set -e
         mariabackup_target_dir=/var/mariadb/backup
         binlog_info_file=$mariabackup_target_dir/xtrabackup_binlog_info 
         [ -e "$binlog_info_file" ] && return
         mkdir -p "$mariabackup_target_dir"
-        marialog=$(mktemp)
-        e=0
-        (set -- \
+        set -- \
                 -u root \
-                --target-dir="$mariabackup_target_dir"
-        exec >"$marialog" 2>&1
+                --target-dir="$mariabackup_target_dir" \
+                "$@"
         set -x
         mariabackup --backup --rsync "$@"
-        mariabackup --prepare "$@") || e=$?
-        if [ "$e" = 0 -a -e "$binlog_info_file" ]
-        then
-                tail -v -n2 "$marialog" >&2
-                rm "$marialog"
-        else
-                cat "$marialog" >&2
-                false
-        fi
+        mariabackup --prepare "$@"
+        [ -e "$binlog_info_file" ]
 }
 
 delete_backup()
@@ -128,13 +136,13 @@ restore_from_backup()
 {
         mariabackup_target_dir=/var/mariadb/backup
         set -e
-
-        # stop_database_server_and_remove_database_files
-
         set -- \
+                --force-non-empty-directories \
                 -u root \
                 --target-dir="$mariabackup_target_dir"
-        if silent_unless_error mariabackup --move-back "$@"
+        set -- "$@"
+        if mostly_silent_unless_error \
+                mariabackup --move-back "$@"
         then
                 # Can't believe mariabackup
                 # is so primitive as to
@@ -163,6 +171,23 @@ silent_unless_error()
         return $r
 }
 
+mostly_silent_unless_error()
+{
+        echo "+ $*" >&2
+        set -- "$(mktemp)" "$@"
+        if
+                "${@:2}" >"$1" 2>&1
+        then
+                tail -n3 "$1" >&2
+                local r=0
+        else
+                local r=$?
+                cat "$1" >&2
+        fi
+        rm "$1"
+        return $r
+}
+
 enable_replication()
 {
         primary_host=$1
@@ -251,29 +276,91 @@ set global server_id = $chosen_id;
 END
 }
 
+mariadb_list_databases()
+{
+mariadb -Bsss "$@" <<.
+select
+        schema_name
+from
+        information_schema.schemata;
+.
+}
+
+list_databases_needed_on_replica()
+{
+        set -- "$(mktemp)" "$(mktemp)"
+        run_primary mariadb_list_databases | sort -u >"$1"
+        run_replica mariadb_list_databases | sort -u >"$2"
+        comm -23 -- "$1" "$2"
+        rm -- "$1" "$2"
+}
+
+mariabackup_create_replica_databases()
+{
+        run_primary create_backup
+        run_primary send_backup "$replica_host"
+        run_replica stop_database_server_and_remove_database_files
+        run_replica restore_from_backup
+}
+
+mariadbdump_create_replica_databases()
+{
+        list_databases_needed_on_replica
+        comm -13 -- \
+                <(list_databases_needed_on_replica | tee /dev/stderr) \
+                <(printf '%s\n' "$@")
+}
+
 main()
 {
         set -e
         check_input
         run_primary set_server_id
-        run_both check_db
-        : showvars replica
+        run_both list_databases
+
+        # run_primary check_db
+        # run_replica check_db
+        # showvars replica
 
         run_primary create_replication_user \
                 "$replica_host" \
                 "$replication_user" \
                 "$replication_password"
-        run_primary create_backup
-        run_primary send_backup "$replica_host"
-        run_replica restore_from_backup
+
+        # mariadbdump_create_replica
+        run_both list_databases
+        mariabackup_create_replica_databases
+        run_both list_databases
+
+        run_replica check_db
         run_replica enable_replication \
                 "$primary_host" \
                 "$replication_user" \
                 "$replication_password"
-        run_replica check_db
-        : run_primary delete_backup
-        run_primary check_db
+        run_both list_databases
+}
+
+cleanup_after_test()
+{
+        run_primary delete_backup || true
 }
 
+list_databases()
+{
+mariadb -t "$@" <<.
+select
+        @@hostname,
+        @@server_id,
+        schema_name as 'database'
+from
+        information_schema.schemata
+;
+.
+}
+
+if true
+then
+        cleanup_after_test
+fi
 main "$@"
 exit $?