worked!

3 files changed, 108 insertions, 74 deletions

diff --git a/mariadb-push-replica.sh b/mariadb-push-replica.sh
deleted file mode 100755
index d645c91..0000000
--- a/mariadb-push-replica.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-set -ex
-
-default_slave_remote_file=data/default-slave-remote
-master_password_file=data/mysql-master-password
-
-if [ -r "$default_slave_remote_file" ]
-then
-        read default_remote_host < "$default_slave_remote_file"
-fi
-
-gen_password()
-{
-        generated_password_length=32
-        generated_password=$(tr -cd a-zA-Z0-9 < /dev/urandom | head -c "$generated_password_length")
-        [ "${#generated_password}" -eq "$generated_password_length" ]
-        printf '%s\n' "$generated_password"
-}
-
-if ! [ -e "$master_password_file" ]
-then
-        gen_password > "$master_password_file"
-fi
-
-if [ -r "$master_password_file" ]
-then
-        read master_password < "$master_password_file" 
-        [ "${#master_password}" -ge 30 ]
-fi
-
-our_host=$(hostname --fqdn)
-remote_host=${1:-$default_remote_host}
-
-[ "$our_host" ]
-[ "$remote_host" ]
-
-master_password=$(false)
-
-ssh -l root "$remote_host" -- mariadb <<END
-CHANGE MASTER TO
-  MASTER_HOST='$our_host',
-  MASTER_USER='replication',
-  MASTER_PASSWORD='$master_password'
-END
diff --git a/src/rpc.bash b/src/rpc.bash
index 853120f..4908767 100644
--- a/src/rpc.bash
+++ b/src/rpc.bash
@@ -14,7 +14,6 @@ __bashrpc__remote_run_script()
         local script="$1"
         shift
         BASH_RPC_SHELL_OPTIONS=(--norc --noprofile)
-        set -x
         # printf 'DEBUG:<%s>\n' "${BASH_RPC_SSH_OPTIONS[@]}" >&2
         exec ssh \
                 "${BASH_RPC_SSH_OPTIONS[@]}" -- \
diff --git a/wip/mariadb-push-replica.sh b/wip/mariadb-push-replica.sh
index fbf9402..dcbabc1 100755
--- a/wip/mariadb-push-replica.sh
+++ b/wip/mariadb-push-replica.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
-set -ex
+set -e
+PATH=./src:$PATH
+source rpc.bash
 
 default_slave_remote_file=data/default-slave-remote
 master_password_file=data/mysql-master-password
@@ -31,50 +33,127 @@ fi
 our_host=$(hostname --fqdn)
 remote_host=${1:-$default_remote_host}
 
-rpc_funcs=
-
-rpc()
-{
-        read shellscript < <(declare -f $rpc_funcs; echo $*)
-        set -- $shellscript
-        ssh -l "$remote_user" -- "$remote_host" ${*@Q}
-}
-
 [ "$our_host" ]
 [ "$remote_host" ]
 [ "$master_password" ]
 
-primarydb_create_user()
+primarydb_host=$our_host
+replicadb_host=$remote_host
+
+replication_user=replication
+replication_password=$master_password
+
+run_primary()
 {
-        :
+        BASH_RPC_REMOTE_DEST=$primarydb_host remote_run_function "$@"
 }
 
-mariabackup_target_dir=/var/mariadb/backup
-primarydb_export_backup()
+run_replica()
 {
-        mkdir -p "$mariabackup_target_dir"
-        mariabackup --backup --target-dir="$mariabackup_target_dir"
+        BASH_RPC_REMOTE_DEST=$replicadb_host remote_run_function "$@"
 }
 
 primarydb()
 {
-        ssh -l root "$remote_host" -- "$@"
+        run_primary mariadb -t
+}
+
+replicadb()
+{
+        run_replica mariadb -t
 }
-remote_user=root
-rpc uptime
-exit 1
 
-ssh -l root "$remote_host" -- mariadb -t <<END
+syscheck()
+{
+        printf \
+                "==> %s %s <==\n    %s\n" \
+                "$(hostname -A)" \
+                "$(hostname -I)" \
+                "$(uptime)"
+}
+
+dbcheck()
+{
+        syscheck
+        mariadb -t <<END | sed 's/^/   /'
 select @@hostname, @@server_id, @@gtid_slave_pos, @@sql_log_bin;
-SELECT VARIABLE_NAME,SESSION_VALUE,GLOBAL_VALUE  FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHERE VARIABLE_NAME='sql_log_bin' OR VARIABLE_NAME='HOSTNAME' \G
-SELECT VARIABLE_NAME,SESSION_VALUE,GLOBAL_VALUE  FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES \G
 END
+}
+
+create_backup()
+{
+        mariabackup_target_dir=/var/mariadb/backup
+        mkdir -p "$mariabackup_target_dir"
+        mariabackup -u root --backup  --target-dir="$mariabackup_target_dir"
+        mariabackup -u root --prepare --target-dir="$mariabackup_target_dir"
+}
+
+send_backup()
+{
+        mariabackup_target_dir=/var/mariadb/backup
+        rsync -zRaP -- /./"$mariabackup_target_dir" "$1":/
+}
+
+enable_replication()
+{
+        our_host=$1
+        replication_user=$2
+        replication_password=$3
+        mariabackup_target_dir=/var/mariadb/backup
+        binlog_info_file=$mariabackup_target_dir/xtrabackup_binlog_info 
+        read  master_log_file master_log_pos gtid_slave_pos < $binlog_info_file || return
+        mariadb -t <<END
+        SET GLOBAL gtid_slave_pos = "$gtid_slave_pos";
+        CHANGE MASTER TO
+          MASTER_HOST='$our_host',
+          MASTER_USER='$replication_user',
+          MASTER_PASSWORD='$replication_password',
+          MASTER_USE_GTID=slave_pos;
+        START SLAVE;
+END
+}
 
-exit 0
+create_replication_user()
+{
+        mariadb -t <<END
+        CREATE OR REPLACE USER '$1' IDENTIFIED BY '$2';
+        GRANT REPLICATION SLAVE ON *.*  TO '$1';
+END
+}
 
-ssh -l root "$remote_host" -- mariadb <<END
-CHANGE MASTER TO
-  MASTER_HOST='$our_host',
-  MASTER_USER='replication',
-  MASTER_PASSWORD='$master_password'
+showvars()
+{
+        for db in primarydb replicadb
+        do
+                $db <<END
+                        select VARIABLE_NAME,SESSION_VALUE,GLOBAL_VALUE 
+                        from INFORMATION_SCHEMA.SYSTEM_VARIABLES
+                        where VARIABLE_NAME='sql_log_bin' or VARIABLE_NAME='HOSTNAME' \G
 END
+        done
+}
+
+checkboth()
+{
+        for h in primary replica
+        do
+                run_$h dbcheck
+        done
+}
+
+if false
+then
+        checkboth
+        showvars
+fi
+mariabackup_target_dir=/var/mariadb/backup
+if [ ! -d "$mariabackup_target_dir" ]
+then
+        run_primary create_replication_user \
+                "$replication_user'@'$replicadb_host" \
+                "$replication_password"
+        run_primary create_backup "$replicadb_host"
+fi
+run_primary send_backup "$replicadb_host"
+run_replica enable_replication "$our_host" "$replication_user" "$replication_password"
+