Bgrestore changes

README.md

@@ -1,15 +1,14 @@
 # bgrestore
 
-bgrestore-auto.sh helps you automatically restore the last successful backup from bgbackup to another MariaDB server. This is very useful for verifying backups, refreshing development environments, etc. 
-
-bgrestore connects to the backup_history table in mdbutil to gather information about the last successful full backup such as whether it's encrypted, compressed, etc. This information is then used to restore on the designated MariaDB server. 
+bgrestore.sh helps you automatically restore the last successful full backup from bgbackup to another MariaDB server. This is very useful for verifying backups, refreshing development environments, etc.
 
+bgrestore connects to the backup_history table in mdbutil to find the last successful full backup for a given host. It then delegates the actual restore (decrypt, decompress, prepare, move-back) to [fgrestore](../mysql-mariadb-physical-backup/files/fgrestore.sh), which needs to be installed alongside bgrestore on the restore host. bgrestore itself only keeps what's genuinely its own: the backup_history lookup, logging/mail, and stopping/starting the MariaDB service around the restore.
 
 ## How to...
 
-This all assumes the backup was taken with bgbackup (https://github.com/bstillman/bgbackup). This is necessary for the script to gather the required information. 
+This all assumes the backup was taken with bgbackup (https://github.com/bstillman/bgbackup). This is necessary for the script to gather the required information.
 
-Copy bgrestore.cnf.dist to /etc/bgrestore.cnf and configure as needed (details below). 
+Copy bgrestore.cnf.dist to /etc/bgrestore.cnf and configure as needed (details below). To run restore tests against a multi-instance host, copy it to a distinct path per instance instead and select it with `bgrestore -c /path/to/that/instance's/bgrestore.cnf`.
 
 Currently the script assumes the location of the backup on the source and the destination is the same. Ex: if the backup is in /backups on the server backed up, it should also reside in /backups on the server to be restored. 
 
@@ -70,13 +69,13 @@ The hostname of the server from which the backup was taken. Ex. If backing up se
 
 The full path to the data directory on the MariaDB server to be restored. 
 
-### datadirowner
+### restore_my_cnf_file
 
-The owner of the data directory. Usually mysql. 
+The my.cnf fgrestore should use for the restore. Parses datadir, tmpdir, innodb log/doublewrite dirs, log-error/log-bin/relay-log paths, and the owning `user=` (fgrestore chowns restored files to whatever `user=` says there, default mysql, if it's not set).
 
-### datadirgroup
+### service_name
 
-The group of the data directory. Usually mysql. 
+The systemd service name to stop/start around the restore. Defaults to `mariadb`; set per-instance (via a distinct config file selected with `-c`) to run restore tests against a multi-instance host.
 
 ### logpath
 

bgrestore.cnf.dist

@@ -2,12 +2,21 @@
 
 # bgrestore configuration file
 
+# Path to the my.cnf fgrestore should use for the restore (parses datadir, tmpdir,
+# innodb log/doublewrite dirs, log-error/log-bin/relay-log paths, and the owning
+# 'user=' for chown). Same default fgrestore itself falls back to.
+restore_my_cnf_file=/etc/my.cnf
+
+# systemd service name to stop/start around the restore. Needed to target a specific
+# instance when running restore tests on a multi-instance host; select which
+# bgrestore.cnf (and thus which service_name) via '-c|--config'.
+service_name=mariadb
 
 # MariaDB host for restore
-restorehost=127.0.0.1
+restorehost=localhost
 
 # MariaDB port for restore
-restoreport=40001
+restoreport=3306
 
 # MariaDB user for restore
 restoreuser=bgbackup
@@ -19,10 +28,10 @@ restorepass=password
 preppath=/backup/tmp
 
 # MariaDB host for backup history
-backuphisthost=127.0.0.1
+backuphisthost=localhost
 
 # MariaDB port for backup history
-backuphistport=40002
+backuphistport=3306
 
 # MariaDB user for backup history
 backuphistuser=bgbackup
@@ -36,18 +45,18 @@ backuphistschema=mdbutil
 # MariaDB host which backup should be from
 backuphost=hostname_from_backup_history
 
+# Skip copy step, place backup in preppath after creating it. This will also make bgrestore delete the contents of the folder instead of the folder itself (after succeeding)
+skipcopy=no
+
 # Datadir
 datadir=/var/lib/mysql
 
-# Datadir owner
-datadirowner=mysql
-
-# Datadir group
-datadirgroup=mysql
-
 # Path to keep logs
 logpath=/var/log
 
+# Number of logs to keep
+keeplognum=1000
+
 # Log to syslog
 syslog=no