evolix/evobackup
22
0
Fork 1
Code Issues 28 Pull requests 5 Releases 20 Activity

client: separate Rsync for the canary file if the main Rsync has finished without errors
All checks were successful
gitea/evobackup/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Jérémy Lecour 2022-12-27 11:56:07 +01:00 committed by Jérémy Lecour
parent ef744f77cf
commit aa7366ce2e
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/CHANGELOG.md
View file

@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Only one loop for all Redis instances * Only one loop for all Redis instances
* remodel how we build the rsync command * remodel how we build the rsync command
* use sub shells instead of moving around * use sub shells instead of moving around
* Separate Rsync for the canary file if the main Rsync has finished without errors
### Deprecated ### Deprecated

44
client/zzz_evobackup
View file

@ -60,6 +60,8 @@ DATE_FORMAT="%Y-%m-%d %H:%M:%S"
# Enable/disable sync tasks (default: enabled) # Enable/disable sync tasks (default: enabled)
: "${SYNC_TASKS:=1}" : "${SYNC_TASKS:=1}"
CANARY_FILE="/zzz_evobackup_canary"
# Source paths can be customized # Source paths can be customized
# Empty lines, and lines containing # or ; are ignored # Empty lines, and lines containing # or ; are ignored
RSYNC_INCLUDES=" RSYNC_INCLUDES="
@ -67,7 +69,6 @@ RSYNC_INCLUDES="
/root /root
/var /var
/home /home
/zzz_evobackup_canary
" "
# Excluded paths can be customized # Excluded paths can be customized
@ -381,7 +382,7 @@ local_tasks() {
log "STOP LOCAL_TASKS" log "STOP LOCAL_TASKS"
} }
build_rsync_cmd() { build_rsync_main_cmd() {
################################################################### ###################################################################
# /!\ WARNING /!\ WARNING /!\ WARNING /!\ WARNING /!\ WARNING /!\ # # /!\ WARNING /!\ WARNING /!\ WARNING /!\ WARNING /!\ WARNING /!\ #
################################################################### ###################################################################
@ -437,6 +438,19 @@ build_rsync_cmd() {
# output final command # output final command
echo "${cmd}" echo "${cmd}"
} }
build_rsync_canary_cmd() {
# Rsync command
cmd="$(command -v rsync)"
# Rsync options
cmd="${cmd} --rsh='ssh -p ${SSH_PORT} -o \"ConnectTimeout ${SSH_CONNECT_TIMEOUT}\"'"
# Rsync local source
cmd="${cmd} ${CANARY_FILE}"
# Rsync remote destination
cmd="${cmd} root@${SSH_SERVER}:/var/backup/"
# output final command
echo "${cmd}"
}
sync_tasks() { sync_tasks() {
n=0 n=0
server="" server=""
@ -478,23 +492,33 @@ sync_tasks() {
fi fi
# Build the final Rsync command # Build the final Rsync command
rsync_cmd=$(build_rsync_cmd) rsync_main_cmd=$(build_rsync_main_cmd)
# … log it # … log it
log "SYNC_TASKS - Rsync command : ${rsync_cmd}" log "SYNC_TASKS - Rsync command : ${rsync_main_cmd}"
# … execute it # … execute it
eval "${rsync_cmd}" eval "${rsync_main_cmd}"
rsync_rc=$? rsync_main_rc=$?
if [ ${rsync_rc} -ne 0 ]; then
error "rsync returned an error ${rsync_rc}, check ${LOGFILE}"
rc=201
fi
# Copy last lines of rsync log to the main log # Copy last lines of rsync log to the main log
tail -n 30 "${RSYNC_LOGFILE}" >> "${LOGFILE}" tail -n 30 "${RSYNC_LOGFILE}" >> "${LOGFILE}"
if [ ${rsync_main_rc} -ne 0 ]; then
error "rsync returned an error ${rsync_main_rc}, check ${LOGFILE}"
rc=201
else
# Build the canary Rsync command
rsync_canary_cmd=$(build_rsync_canary_cmd)
# … log it
log "SYNC_TASKS - Rsync canary command : ${rsync_canary_cmd}"
# … execute it
eval "${rsync_canary_cmd}"
fi
log "STOP SYNC_TASKS - server=${server}" log "STOP SYNC_TASKS - server=${server}"
} }