it so tight and it be workin to replicate n shit n keep up n verify that to the user with its output

1 files changed, 42 insertions, 50 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index 7d92859..d0c87b7 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -65,26 +65,6 @@ show_hostnames()
                 "$(uptime)"
 }
 
-check_db()
-{
-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 "$@"
@@ -326,32 +306,38 @@ END
 mariadb_enable_semi_sync()
 {
         set -e
-        chosen_id=$(truncated_machineid_decimal_string_int32)
-        [ "$chosen_id" -gt 1 ]
-        mariadb -v --skip-reconnect -t <<END
+        [ "$1" = off ] || set -- on
+        mariadb -v --skip-reconnect -t <<.
 stop slave io_thread;
-set global rpl_semi_sync_master_enabled = on;
-set global rpl_semi_sync_slave_enabled = on;
+set global rpl_semi_sync_master_enabled = $1;
+set global rpl_semi_sync_slave_enabled = $1;
+.
+        mariadb_show_vars_like 'rpl_%'
+}
 
-use information_schema;
+mariadb_show_vars_like()
+{
+        set -e
+        mariadb -v --skip-reconnect -t <<.
 select
         @@hostname
 ,       @@server_id
 ;
+use information_schema;
 select
         variable_name
 ,       variable_value
 from
         global_variables
 where
-        variable_name like 'rpl_%'
+        variable_name like '$1'
 ;
-END
+.
 }
 
 mariadb_list_databases()
 {
-        list_databases >&2
+        show_all_databases >&2
         mariadb --skip-reconnect -Bsss "$@" <<.
 select
         schema_name
@@ -440,15 +426,18 @@ save_array()
 
 mariadb_scan_databases()
 {
+        set -- $(mktemp)
         declare -g -a primary_dbs
         save_array primary_dbs from lines <(
-                run_primary mariadb_list_databases </dev/null |
+                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 |
+                run_replica \
+                        mariadb_list_databases </dev/null 2>>"$1" |
                 sort -u
         )
 
@@ -456,6 +445,20 @@ mariadb_scan_databases()
         save_array primary_dbs_not_on_replica from zfile <(
                 subtract_arrays primary_dbs replica_dbs
         )
+        if [ ${#primary_dbs_not_on_replica[@]} -gt 0 ]
+        then
+                cat "$1" >&2
+        fi
+        rm -- "$1"
+}
+
+showmissing()
+{
+        if [ ${#primary_dbs_not_on_replica[@]} -gt 0 ]
+        then
+                printf "Missing on ${replica_host}: %s\n" \
+                        "${primary_dbs_not_on_replica[@]}" >&2
+        fi
 }
 
 choose_mariadbdump_target_databases()
@@ -464,11 +467,7 @@ choose_mariadbdump_target_databases()
         shift
         if [ $# = 0 ]
         then
-                if [ ${#primary_dbs_not_on_replica[@]} -gt 0 ]
-                then
-                        printf "Missing on ${replica_host}: %s\n" \
-                                "${primary_dbs_not_on_replica[@]}" >&2
-                fi
+                showmissing
 
                 if [ "$SEND_ALL_MARIADB_DATABASES" ]
                 then
@@ -502,19 +501,12 @@ main()
         set -e
         check_input
 
-        run_both set_server_id
-        run_both mariadb_enable_semi_sync
-
-        # run_primary check_db
-        # run_replica check_db
-        # showvars replica
-
-        # run_primary list_databases
-        # run_replica list_databases
+        : run_both set_server_id
+        : run_both mariadb_enable_semi_sync off
 
         mariadb_scan_databases
-        choose_mariadbdump_target_databases to_replicate "$@"
-        if [ ${#to_replicate[@]} -gt 0 ]
+        choose_mariadbdump_target_databases databases "$@"
+        if [ ${#databases[@]} -gt 0 ]
         then
                 run_replica mariadb_install_replication_credentials \
                         "$primary_host" \
@@ -527,8 +519,8 @@ main()
                         --apply-slave-statements \
                         --gtid \
                         --single-transaction \
-                        --databases "${to_replicate[@]}"
-                run_replica list_databases
+                        --databases "${databases[@]}"
+                run_replica show_all_databases
         fi
         #run_replica mariadb <<< 'show slave status\G'
         #run_primary mariadb <<< 'show master status\G'
@@ -565,7 +557,7 @@ cleanup_after_test()
         run_primary delete_backup || true
 }
 
-list_databases()
+show_all_databases()
 {
 mariadb -t "$@" <<.
 select