refactors

1 files changed, 70 insertions, 24 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index 69b9edf..ab83ada 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -36,10 +36,6 @@ primary_host=$(hostname --fqdn)
 replica_host=${1:-$default_replica_host}
 replication_user=replication
 
-[ "$primary_host" ]
-[ "$replica_host" ]
-[ "$replication_password" ]
-
 run_primary()
 {
         (set -x
@@ -199,23 +195,73 @@ END
         done
 }
 
-set -e
-run_primary check_db
-run_replica check_db
-: showvars replica
-: exit
-
-run_primary create_replication_user \
-        "$replica_host" \
-        "$replication_user" \
-        "$replication_password"
-run_primary create_backup
-run_primary send_backup "$replica_host"
-run_replica restore_from_backup
-run_replica enable_replication \
-        "$primary_host" \
-        "$replication_user" \
-        "$replication_password"
-run_replica check_db
-run_primary delete_backup
-run_primary check_db
+check_input()
+{
+        [ "$primary_host" ]
+        [ "$replica_host" ]
+        [ "$replication_user" ]
+        [ "$replication_password" ]
+        dns_check_servers
+}
+
+dns_check_servers()
+{
+        primary_ipv4=$(dig +short -ta "$primary_host")
+        replica_ipv4=$(dig +short -ta "$replica_host")
+        echo "primary: $primary_host $primary_ipv4"
+        echo "replica: $replica_host $replica_ipv4"
+}
+
+truncated_machineid_decimal_string_int32()
+{
+        systemd-id128 machine-id |
+        sha256sum |
+        ( read -n8 &&
+        printf '%u\n' 0x"$REPLY" )
+}
+
+run_both()
+{
+        set -e
+        r=0
+        run_primary "$@" || r=$?
+        run_replica "$@"
+        return $r
+}
+
+set_server_id()
+{
+        set -e
+        chosen_id=$(truncated_machineid_decimal_string_int32)
+        [ "$chosen_id" -gt 1 ]
+        mariadb --skip-reconnect -t <<END
+set global server_id = $chosen_id;
+END
+}
+
+main()
+{
+        set -e
+        check_input
+        run_both set_server_id
+        run_both check_db
+        : showvars replica
+
+        run_primary create_replication_user \
+                "$replica_host" \
+                "$replication_user" \
+                "$replication_password"
+        run_primary create_backup
+        run_primary send_backup "$replica_host"
+        run_replica restore_from_backup
+        run_replica enable_replication \
+                "$primary_host" \
+                "$replication_user" \
+                "$replication_password"
+        run_replica check_db
+        run_primary delete_backup
+        run_primary check_db
+}
+
+main "$@"
+exit $?