omfg replication actually works

1 files changed, 131 insertions, 61 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index 56a3b42..7d92859 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -198,16 +198,18 @@ mostly_silent_unless_error()
 mariadb_install_replication_credentials()
 {
         set -e
-        tee /dev/stderr <<END | mariadb --skip-reconnect -t
+        mariadb -v --skip-reconnect -t <<.
 stop slave
 ;
 change master
 to
-        master_host='$1'
-,       master_user='$2'
-,       master_password='$3'
+        master_host     = '$1'
+,       master_user     = '$2'
+,       master_password = '$3'
+,       master_ssl = 1
+,       master_ssl_verify_server_cert = 1
 ;
-END
+.
 }
 
 enable_replication_via_mariabackup_xtra_info()
@@ -218,40 +220,63 @@ enable_replication_via_mariabackup_xtra_info()
         mariabackup_target_dir=/var/mariadb/backup
         binlog_info_file=$mariabackup_target_dir/xtrabackup_binlog_info 
         set -e
-        read master_log_file master_log_pos gtid_slave_pos < $binlog_info_file
-        tee /dev/stderr <<END | mariadb --skip-reconnect -t
-STOP SLAVE;
-SET GLOBAL gtid_slave_pos = "$gtid_slave_pos";
-CHANGE MASTER TO
-  MASTER_HOST='$primary_host',
-  MASTER_USER='$replication_user',
-  MASTER_PASSWORD='$replication_password',
-  MASTER_USE_GTID=slave_pos;
-START SLAVE;
-SHOW SLAVE STATUS\G
-END
+        read \
+                master_log_file \
+                master_log_pos \
+                gtid_slave_pos \
+                < $binlog_info_file
+        mariadb -v --skip-reconnect -t <<.
+stop slave;
+set global
+        gtid_slave_pos  = '$gtid_slave_pos'
+;
+change master
+to
+        master_host     = '$primary_host',
+        master_user     = '$replication_user',
+        master_password = '$replication_password',
+        master_use_gtid = slave_pos
+;
+start slave;
+show slave status\g
+.
         set -x
         rm -r /var/mariadb/backup
 }
 
 create_replication_user()
 {
-        mariadb --skip-reconnect -t <<END
-CREATE OR REPLACE USER '$2'@'$1' IDENTIFIED BY '$3';
-GRANT REPLICATION SLAVE ON *.*  TO '$2'@'$1';
-END
+        mariadb --skip-reconnect -t <<.
+
+create or replace
+user
+        '$2'@'$1'
+identified by
+        '$3'
+;
+
+grant replication slave
+on
+        *.*
+to
+        '$2'@'$1'
+;
+.
 }
 
 showvars()
 {
-        for h in "$@"
-        do
-                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
-END
-        done
+        mariadb --skip-reconnect -t <<.
+select
+        variable_name
+,       session_value
+,       global_value
+from
+        information_schema.system_variables
+where
+        variable_name like '%slave%state%'
+\G
+.
 }
 
 check_input()
@@ -293,15 +318,41 @@ set_server_id()
         set -e
         chosen_id=$(truncated_machineid_decimal_string_int32)
         [ "$chosen_id" -gt 1 ]
-        mariadb --skip-reconnect -t <<END
+        mariadb -v --skip-reconnect -t <<END
 set global server_id = $chosen_id;
 END
 }
 
+mariadb_enable_semi_sync()
+{
+        set -e
+        chosen_id=$(truncated_machineid_decimal_string_int32)
+        [ "$chosen_id" -gt 1 ]
+        mariadb -v --skip-reconnect -t <<END
+stop slave io_thread;
+set global rpl_semi_sync_master_enabled = on;
+set global rpl_semi_sync_slave_enabled = on;
+
+use information_schema;
+select
+        @@hostname
+,       @@server_id
+;
+select
+        variable_name
+,       variable_value
+from
+        global_variables
+where
+        variable_name like 'rpl_%'
+;
+END
+}
+
 mariadb_list_databases()
 {
         list_databases >&2
-        mariadb -Bsss "$@" <<.
+        mariadb --skip-reconnect -Bsss "$@" <<.
 select
         schema_name
 from
@@ -409,43 +460,30 @@ mariadb_scan_databases()
 
 choose_mariadbdump_target_databases()
 {
-        declare -n target_databases="$1"
+        declare -n _target_db_array="$1"
         shift
         if [ $# = 0 ]
         then
-                target_databases=()
-                [ ${#primary_dbs_not_on_replica[@]} -gt 0 ] || return 0
-                printf "Missing on ${replica_host}: %s\n" \
-                        "${primary_dbs_not_on_replica[@]}" >&2
-                [ "$SEND_ALL_MARIADB_DATABASES" ] || return 0
-                target_databases=("${primary_dbs_not_on_replica[@]}")
+                if [ ${#primary_dbs_not_on_replica[@]} -gt 0 ]
+                then
+                        printf "Missing on ${replica_host}: %s\n" \
+                                "${primary_dbs_not_on_replica[@]}" >&2
+                fi
+
+                if [ "$SEND_ALL_MARIADB_DATABASES" ]
+                then
+                        _target_db_array=("${primary_dbs_not_on_replica[@]}")
+                else
+                        _target_db_array=()
+                fi
         else
-                save_array target_databases from lines \
+                save_array _target_db_array from lines \
                         <(intersection_lines \
                                 <(printarray primary_dbs_not_on_replica) \
                                 <(printlines "$@" | sort -u))
         fi
 }
 
-mariadbdump_transfer_missing_databases()
-{
-        mariadbdump_transfer_databases \
-                "$replica_host" \
-                "${to_replicate[@]}"
-}
-
-mariadbdump_transfer_databases()
-{
-        [ $# -ge 2 ] || return 0
-        run_primary \
-                send_mariadb_dump "$1" \
-                --master-data \
-                --apply-slave-statements \
-                --gtid \
-                --single-transaction \
-                --databases "${@:2}"
-}
-
 intersection_lines()
 {
         comm -12 -- "$1" "$2"
@@ -465,6 +503,7 @@ main()
         check_input
 
         run_both set_server_id
+        run_both mariadb_enable_semi_sync
 
         # run_primary check_db
         # run_replica check_db
@@ -482,7 +521,8 @@ main()
                         "$replication_user" \
                         "$replication_password"
                 run_primary \
-                        send_mariadb_dump "$replica_host" \
+                        send_mariadb_dump \
+                        "$replica_host" \
                         --master-data \
                         --apply-slave-statements \
                         --gtid \
@@ -490,6 +530,34 @@ main()
                         --databases "${to_replicate[@]}"
                 run_replica list_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 --skip-reconnect -sssB <<< \
+                'select @@gtid_binlog_pos;')
+        [ "$gtid" ] && run_replica wait_on_gtid "$gtid"
+}
+
+wait_on_gtid()
+{
+        local gtid="$1"
+        mariadb -t <<.
+select
+        @@hostname
+,       @@gtid_slave_pos as 'slave gtid'
+,       '$gtid' as 'master gtid'
+;
+stop slave ;
+stop slave io_thread ;
+start slave ;
+start slave io_thread ;
+.
+        mariadb -t -v <<.
+select
+        master_gtid_wait('$gtid')
+;
+.
 }
 
 cleanup_after_test()
@@ -504,12 +572,14 @@ select
         @@hostname
 ,       @@server_id
 ,       count(schema_name) as 'databases'
+,       user() as 'login'
 ,       @@gtid_slave_pos
+,       @@gtid_binlog_pos
 from
         information_schema.schemata
-;
+\G
 select
-        schema_name as 'database'
+        schema_name as 'database name'
 from
         information_schema.schemata
 ;