cleanup

1 files changed, 13 insertions, 17 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index f4077cc..c9b513b 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -71,7 +71,6 @@ stop_mariadb_server_and_remove_database_files()
         set -e
         set -o pipefail
         [ -e "$livedb" ] || return 0
-
         if [ "$(systemctl is-active mariadb)" = active ]
         then
                 systemctl stop mariadb
@@ -135,14 +134,12 @@ to
 create_replication_user()
 {
         mariadb --skip-reconnect -t <<.
-
 create or replace
 user
         '$2'@'$1'
 identified by
         '$3'
 ;
-
 grant replication slave
 on
         *.*
@@ -319,18 +316,18 @@ save_array()
 
 mariadb_scan_databases()
 {
-        set -- $(mktemp)
+        set -- "$(mktemp)"
         declare -g -a primary_dbs
         save_array primary_dbs from lines <(
-                run_primary \
-                        mariadb_list_databases </dev/null 2>"$1" |
+                run_primary mariadb_list_databases \
+                </dev/null 2>"$1" |
                 sort -u
         )
 
         declare -g -a replica_dbs
         save_array replica_dbs from lines <(
-                run_replica \
-                        mariadb_list_databases </dev/null 2>>"$1" |
+                run_replica mariadb_list_databases \
+                </dev/null 2>>"$1" |
                 sort -u
         )
 
@@ -401,7 +398,8 @@ main()
         choose_mariadbdump_target_databases databases "$@"
         if [ ${#databases[@]} -gt 0 ]
         then
-                run_replica mariadb_install_replication_credentials \
+                run_replica \
+                        mariadb_install_replication_credentials \
                         "$primary_host" \
                         "$replication_user" \
                         "$replication_password"
@@ -413,13 +411,11 @@ main()
                         --gtid \
                         --single-transaction \
                         --databases "${databases[@]}"
-                run_replica show_all_databases
+                run_replica \
+                        show_all_databases
         fi
-        #run_replica mariadb <<< 'show slave status\G'
-        #run_primary mariadb <<< 'show master status\G'
-        #run_replica showvars
-        #run_replica mariadb <<< 'show slave status\G'
-        gtid=$(run_primary mariadb_get_primary_gtid)
+        gtid=$(run_primary
+                mariadb_get_primary_gtid </dev/null)
         [ "$gtid" ] && run_replica wait_on_gtid "$gtid"
 }
 
@@ -466,8 +462,8 @@ select
 ,       @@server_id
 ,       count(schema_name) as 'databases'
 ,       user() as 'login'
-,       @@gtid_slave_pos
-,       @@gtid_binlog_pos
+,       @@gtid_slave_pos as 'replica gtid'
+,       @@gtid_binlog_pos as 'primary gtid'
 from
         information_schema.schemata
 \G