1 files changed, 53 insertions, 10 deletions

diff --git a/wip/mariadb-push-replica.sh b/wip/mariadb-push-replica.sh
index 5e87358..c4df851 100755
--- a/wip/mariadb-push-replica.sh
+++ b/wip/mariadb-push-replica.sh
@@ -64,7 +64,7 @@ show_hostnames()
 check_db()
 {
         show_hostnames
-        mariadb -t <<END | sed 's/^/   /'
+        mariadb --skip-reconnect -t <<END
 select @@hostname, @@server_id, @@gtid_slave_pos, @@sql_log_bin;
 END
 }
@@ -77,14 +77,15 @@ create_backup()
         [ -e "$binlog_info_file" ] && return
         mkdir -p "$mariabackup_target_dir"
         marialog=$(mktemp)
+        e=0
         (set -- \
                 -u root \
                 --target-dir="$mariabackup_target_dir"
         exec >"$marialog" 2>&1
         set -x
         mariabackup --backup --rsync "$@"
-        mariabackup --prepare "$@")
-        if [ -e "$binlog_info_file" ]
+        mariabackup --prepare "$@") || e=$?
+        if [ "$e" = 0 -a -e "$binlog_info_file" ]
         then
                 tail -v -n2 "$marialog" >&2
                 rm "$marialog"
@@ -107,24 +108,62 @@ send_backup()
         rsync -zaR -- /./"${mariabackup_target_dir#/}" "$1":/
 }
 
+restore_from_backup()
+{
+        livedb=/var/lib/mysql
+        mariabackup_target_dir=/var/mariadb/backup
+        set -e
+        if [ -e "$livedb" ]
+        then
+                if [ "$(systemctl is-active mariadb)" = active ]
+                then
+                        systemctl stop mariadb
+                fi
+                livedb_backup=$livedb~$(date -Ins)
+                mv -v -T -- "$livedb" "$livedb_backup"
+                mkdir "$livedb"
+                chown --reference="$livedb_backup" "$livedb"
+                chmod --reference="$livedb_backup" "$livedb"
+        fi
+        marialog=$(mktemp)
+        exec >"$marialog" 2>&1
+        set -- \
+                -u root \
+                --target-dir="$mariabackup_target_dir"
+        if mariabackup --move-back "$@"
+        then
+                tail -v -n2 "$marialog" >&2
+                # Can't believe mariabackup
+                # is so primitive as to
+                # recommend this chown in its
+                # documentation
+                chown -R mysql:mysql /var/lib/mysql
+                systemctl start mariadb
+        else
+                cat "$marialog" >&2
+        fi
+
+}
+
 enable_replication()
 {
-        replica_host=$1
+        primary_host=$1
         replication_user=$2
         replication_password=$3
         mariabackup_target_dir=/var/mariadb/backup
         binlog_info_file=$mariabackup_target_dir/xtrabackup_binlog_info 
-        [ -e "$binlog_info_file" ] || return 0
+        set -e
         read master_log_file master_log_pos gtid_slave_pos < $binlog_info_file
-        tee /dev/stderr <<END | mariadb -t
+        tee /dev/stderr <<END | mariadb --skip-reconnect -t
 STOP SLAVE;
 SET GLOBAL gtid_slave_pos = "$gtid_slave_pos";
 CHANGE MASTER TO
-  MASTER_HOST='$replica_host',
+  MASTER_HOST='$primary_host',
   MASTER_USER='$replication_user',
   MASTER_PASSWORD='$replication_password',
   MASTER_USE_GTID=slave_pos;
 START SLAVE;
+SHOW SLAVE STATUS\G
 END
         set -x
         rm -r /var/mariadb/backup
@@ -132,7 +171,7 @@ END
 
 create_replication_user()
 {
-        mariadb -t <<END
+        mariadb --skip-reconnect -t <<END
 CREATE OR REPLACE USER '$2'@'$1' IDENTIFIED BY '$3';
 GRANT REPLICATION SLAVE ON *.*  TO '$2'@'$1';
 END
@@ -142,7 +181,7 @@ showvars()
 {
         for h in "$@"
         do
-                run_$h mariadb -t <<END
+                run_$h mariadb --skip-reconnect -t <<END
 select VARIABLE_NAME,SESSION_VALUE,GLOBAL_VALUE 
 from INFORMATION_SCHEMA.SYSTEM_VARIABLES
 where VARIABLE_NAME LIKE '%SLAVE%' \G
@@ -150,6 +189,7 @@ END
         done
 }
 
+set -e
 run_primary check_db
 run_replica check_db
 : showvars replica
@@ -161,8 +201,11 @@ run_primary create_replication_user \
         "$replication_password"
 run_primary create_backup
 run_primary send_backup "$replica_host"
+run_replica restore_from_backup
 run_replica enable_replication \
-        "$replica_host" \
+        "$primary_host" \
         "$replication_user" \
         "$replication_password"
+run_replica check_db
 run_primary delete_backup
+run_primary check_db