error-handling correctness fix

1 files changed, 19 insertions, 8 deletions

diff --git a/src/mariadb-push-replica.sh b/src/mariadb-push-replica.sh
index cdb7d72..5e18757 100755
--- a/src/mariadb-push-replica.sh
+++ b/src/mariadb-push-replica.sh
@@ -63,7 +63,7 @@ check_db()
 {
         show_hostnames
         mariadb --skip-reconnect -t <<END
-select @@hostname, @@server_id, @@gtid_slave_pos, @@sql_log_bin;
+select user(), @@hostname, @@server_id, @@gtid_slave_pos, @@sql_log_bin;
 END
 }
 
@@ -129,16 +129,13 @@ restore_from_backup()
         mariabackup_target_dir=/var/mariadb/backup
         set -e
 
-        stop_database_server_and_remove_database_files
+        # stop_database_server_and_remove_database_files
 
-        marialog=$(mktemp)
-        exec >"$marialog" 2>&1
         set -- \
                 -u root \
                 --target-dir="$mariabackup_target_dir"
-        if mariabackup --move-back "$@"
+        if silent_unless_error mariabackup --move-back "$@"
         then
-                tail -v -n2 "$marialog" >&2
                 # Can't believe mariabackup
                 # is so primitive as to
                 # recommend this chown in its
@@ -147,9 +144,23 @@ restore_from_backup()
                 systemctl start mariadb
                 set_server_id
         else
-                cat "$marialog" >&2
+                exit $?
         fi
+}
 
+silent_unless_error()
+{
+        set -- "$(mktemp)" "$@"
+        if
+                "${@:2}" >"$1" 2>&1
+        then
+                local r=0
+        else
+                local r=$?
+                cat "$1" >&2
+        fi
+        rm "$1"
+        return $r
 }
 
 enable_replication()
@@ -260,7 +271,7 @@ main()
                 "$replication_user" \
                 "$replication_password"
         run_replica check_db
-        run_primary delete_backup
+        : run_primary delete_backup
         run_primary check_db
 }