ensure replication user is created on server with output to user

1 files changed, 50 insertions, 16 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index 140fb2e..cde164c 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -56,8 +56,7 @@ run_()
 {
         case "$1" in
                 primary_host | replica_host ) ;;
-                *_host ) return 54 ;; # lol wut
-                * ) return 53 ;;
+                * ) return 58 ;;
         esac
         (set -x
         : ${1%_host} : $2 $3 ${4:+ ...})
@@ -151,7 +150,7 @@ to
 .
 }
 
-create_replication_user()
+create_and_authorize_replication_user()
 {
         mariadb --skip-reconnect -t <<.
 create or replace
@@ -161,12 +160,28 @@ identified
 by
         '$3'
 ;
-grant replication slave
+grant
+        replication replica
 on
         *.*
 to
         '$2'@'$1'
 ;
+select
+        @@hostname
+        as
+                'primary host'
+,       concat (user, '@', host)
+        as
+                login
+,       repl_slave_priv
+        as
+                'replica privilege'
+from
+        mysql.user
+where
+        repl_slave_priv = 'Y'
+;
 .
 }
 
@@ -224,9 +239,11 @@ set_server_id()
         set -e
         chosen_id=$(truncated_machineid_decimal_string_int32)
         [ "$chosen_id" -gt 1 ]
-        mariadb -v --skip-reconnect -t <<END
-set global server_id = $chosen_id;
-END
+        mariadb -v --skip-reconnect -t <<.
+set global
+        server_id = $chosen_id
+;
+.
 }
 
 mariadb_enable_semi_sync()
@@ -234,9 +251,15 @@ mariadb_enable_semi_sync()
         set -e
         [ "$1" = off ] || set -- on
         mariadb -v --skip-reconnect -t <<.
-stop slave io_thread ;
-set global rpl_semi_sync_master_enabled = $1 ;
-set global rpl_semi_sync_slave_enabled = $1 ;
+stop
+        slave io_thread
+;
+set global
+        rpl_semi_sync_master_enabled = $1
+;
+set global
+        rpl_semi_sync_slave_enabled = $1
+;
 .
         mariadb_show_vars_like 'rpl_%'
 }
@@ -312,7 +335,9 @@ send_mariadb_dump()
                 set -x
                 mariadb-dump "${@:2}"
         ) |
-        replica_host="$1" run_replica receive_mariadb_dump
+        BASH_RPC_REMOTE_DEST=$1 \
+                remote_run_function \
+                receive_mariadb_dump
 }
 
 receive_mariadb_dump()
@@ -415,6 +440,10 @@ main()
 
         : run_both set_server_id
         : run_both mariadb_enable_semi_sync off
+        run_primary create_and_authorize_replication_user \
+                "$replica_host" \
+                "$replication_user" \
+                "$replication_password"
 
         mariadb_scan_databases
         choose_mariadbdump_target_databases databases "$@"
@@ -455,16 +484,21 @@ select
 mariadb_wait_on_gtid()
 {
         local gtid="$1"
-        mariadb -t <<.
+        mariadb --skip-reconnect -t <<.
 select
         @@hostname
 ,       @@gtid_slave_pos as 'replica gtid'
 ,       '$gtid' as 'primary gtid'
 ;
-stop slave ;
-start slave ;
+stop
+        slave io_thread
+;
+start
+        slave io_thread
+;
 .
-        mariadb -t -v <<.
+        echo "trying primary_gtid_wait()... " >&2
+        mariadb -t --skip-reconnect <<.
 select
         master_gtid_wait('$gtid')
         as \`primary_gtid_wait('$gtid')\`
@@ -479,7 +513,7 @@ cleanup_after_test()
 
 show_all_databases()
 {
-mariadb -t "$@" <<.
+mariadb --skip-reconnect -t "$@" <<.
 select
         @@hostname
 ,       @@server_id