X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=btrbk-run;h=dcca4b7dd036dca6fb662f40e9904a824160e6bd;hp=50e64b811f0809d2a9a09161534f5750d2e1b46a;hb=72c18f3a6a7f1ed0ca16af654a1f804ab96e1ff9;hpb=3c7dab4936f011bb91f42f7ccb1f8432b94ea040 diff --git a/btrbk-run b/btrbk-run index 50e64b8..dcca4b7 100644 --- a/btrbk-run +++ b/btrbk-run @@ -77,6 +77,7 @@ pull_reexec=false default_args_file=/etc/btrbk-run.conf if [[ -s $default_args_file ]]; then + # shellcheck disable=SC2046 # we want word splitting set -- $(< $default_args_file) "$@" # i havent used this feature yet, so warn about it echo "$0: warning: default btrbk-run options set in $default_args_file (sleeping 5 seconds):" @@ -87,8 +88,9 @@ fi targets=() early=false cron=false +fast=false orig_args=("$@") -temp=$(getopt -l cron,pull-reexec,help 23ceil:m:npqrs:t:vh "$@") || usage 1 +temp=$(getopt -l cron,fast,pull-reexec,help 23ceil:m:npqrs:t:vh "$@") || usage 1 eval set -- "$temp" while true; do case $1 in @@ -107,6 +109,9 @@ while true; do -c) conf_only=true ;; # quit early, just btrbk, no extra remounting etc. -e) early=true ;; + # skip various checks. when we run twice in a row for + # switch mail-host, no need to repeat the same checks again. + --fast) fast=true ;; -i) incremental_strict=true ;; # bytes per second, suffix k m g -l) rate_limit=$2; shift ;; @@ -202,8 +207,25 @@ kd_spread=false if [[ ! -v targets && ! $source ]]; then if $cron; then if [[ $HOSTNAME != "$MAIL_HOST" ]]; then - if [[ $HOSTNAME == kd && $MAIL_HOST = x2 ]]; then - kd_spread=true + if [[ $HOSTNAME == kd && $MAIL_HOST == x3 ]]; then + if ping -q -c1 -w1 x3.office.fsf.org &>/dev/null; then + work_host=x3.office.fsf.org + elif ping -q -c1 -w1 x3wg.b8.nz &>/dev/null; then + work_host=x3wg.b8.nz + fi + if [[ $work_host ]]; then + source_state="$(ssh $work_host cat /a/bin/bash_unpublished/source-state)" + eval "$source_state" + if [[ $MAIL_HOST == x3 ]]; then + kd_spread=true + else + echo "MAIL_HOST=$MAIL_HOST, nothing to do" + mexit 0 + fi + else + echo "MAIL_HOST=$MAIL_HOST, nothing to do" + mexit 0 + fi else echo "MAIL_HOST=$MAIL_HOST, nothing to do" mexit 0 @@ -211,9 +233,6 @@ if [[ ! -v targets && ! $source ]]; then fi fi - # x2 at home atm - kd_spread=false - at_work=false at_home=false @@ -242,11 +261,13 @@ if [[ ! -v targets && ! $source ]]; then ;;& *) if $at_home; then - # main work machine - if ping -q -c1 -w1 x3.office.fsf.org &>/dev/null; then - targets+=(x3.office.fsf.org) - else - targets+=(x3wg.b8.nz) + if ! $kd_spread; then + # main work machine + if ping -q -c1 -w1 x3.office.fsf.org &>/dev/null; then + targets+=(x3.office.fsf.org) + else + targets+=(x3wg.b8.nz) + fi fi for h in frodo kd; do if [[ $HOSTNAME == "$h" ]]; then @@ -345,7 +366,7 @@ echo "mountpoints: ${mountpoints[*]}" ##### end command line parsing ######## -if [[ $source ]]; then +if ! $fast && [[ $source ]]; then if [[ $(ssh $source ps --no-headers -o comm 1) == systemd ]]; then status=$(ssh $source systemctl is-active btrbk.service) || : # normally returns 3 case $status in @@ -383,33 +404,46 @@ fi if ! command -v btrbk &>/dev/null; then die "error: no btrbk binary found" fi -# if our mountpoints are from stale snapshots, -# it doesn't make sense to do a backup. -m check-subvol-stale ${mountpoints[@]} || die "found stale mountpoints in ${mountpoints[*]}" -# for an initial run, btrbk requires the dir to exist. -mkdir -p /mnt/{root,o}/btrbk +if ! $fast; then + # if our mountpoints are from stale snapshots, + # it doesn't make sense to do a backup. + m check-subvol-stale ${mountpoints[@]} || die "found stale mountpoints in ${mountpoints[*]}" + + # for an initial run, btrbk requires the dir to exist. + mkdir -p /mnt/{root,o}/btrbk +fi local_zone=$(date +%z) if [[ $source ]]; then - if ! zone=$(ssh root@$source date +%z); then - if $conf_only; then - echo "$0: warning: failed to ssh to root@$source" - else - die failed to ssh to root@$source + if $fast; then + zone=$local_zone + else + if ! zone=$(ssh root@$source date +%z); then + if $conf_only; then + echo "$0: warning: failed to ssh to root@$source" + else + die failed to ssh to root@$source + fi + fi + if [[ $zone != "$local_zone" ]]; then + die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost" fi fi - if [[ $zone != "$local_zone" ]]; then - die "error: dont confuse yourself with multiple time zones. $h has different timezone than localhost" - fi - else sshable=() sshfail=() min_idle_ms=$((1000 * 60 * 15)) for h in ${targets[@]}; do - if remote_info=( $(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1") ); then + if $fast || $conf_only; then + # Use some typical values in this case + root_size=$(( 1024 * 1024 * 2000 )) #2tb + percent_used=10 + zone=$(date +%z) + elif tmpstr=$(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk /mnt/o/btrbk && date +%z && df --output=size,pcent / | tail -n1"); then + IFS=" " read -r -a remote_info <<<"$tmpstr" + zone=${remote_info[0]} root_size=${remote_info[1]} percent_used=${remote_info[2]%%%} @@ -417,11 +451,6 @@ else if (( ${#remote_info[@]} != 3 )); then die "error: didnt get 3 fields in test ssh to target $h. investigate" fi - elif $conf_only; then - # Use some typical values in this case - root_size=$(( 1024 * 1024 * 2000 )) #2tb - percent_used=10 - zone=$(date +%z) else sshfail+=($h) continue @@ -499,6 +528,9 @@ snapshot_dir btrbk target_preserve $std_preserve target_preserve_min 2h +# i tried this when investigating: clone no source subvolume found error +#incremental_prefs sro:1 srn:1 sao san:1 aro:1 arn:1 + # if something fails and it's not obvious, try doing # btrbk -l debug -v dryrun @@ -531,7 +563,7 @@ EOF mp_count=${#mountpoints[@]} for (( i=0; i < mp_count - 1 ; i++ )); do if [[ ${mountpoints[i]} == /q ]]; then - unset mountpoints[i] + unset "mountpoints[i]" mountpoints+=(/q) fi done @@ -615,8 +647,12 @@ if mountpoint $rsync_mountpoint >/dev/null; then done fi +subvols=() +for mp in "${mountpoints[@]}"; do + subvols+=("${mp##*/}") +done if [[ $source ]]; then - m mount-latest-subvol + m mount-latest-subvol "${subvols[@]}" else m /a/exe/mount-latest-remote ${targets[@]} fi