X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=btrbk-run;h=68363821af2b1f695655805c83fe683d7f8102cc;hp=7e66bc22335455c9f77c8cd6fae32032372c5330;hb=77917a8fbf2032a8b2634a1b3de0879ec45cf213;hpb=b311e6f6fa930805674d7d53d67cd033fdbf3367 diff --git a/btrbk-run b/btrbk-run index 7e66bc2..6836382 100644 --- a/btrbk-run +++ b/btrbk-run @@ -16,53 +16,10 @@ # todo: if we cancel in the middle of a btrfs send, then run again immediately, the received subvolume doesn't get a Received UUID: field, and we won't mount it. Need to figure out a solution that will fix this. -err-bash-trace() { - local -i argc_index=0 frame i start=${1:-0} max_indent=8 indent - local source - local extdebug=false - if [[ $(shopt -p extdebug) == *-s* ]]; then - extdebug=true - fi - for ((frame=0; frame < ${#FUNCNAME[@]}-1; frame++)); do - argc=${BASH_ARGC[frame]} - argc_index+=$argc - ((frame < start)) && continue - if (( ${#BASH_SOURCE[@]} > 1 )); then - source="${BASH_SOURCE[frame+1]}:${BASH_LINENO[frame]}:" - fi - indent=$((frame-start + 1)) - indent=$((indent < max_indent ? indent : max_indent)) - printf "%${indent}s↳%sin \`%s" '' "$source" "${FUNCNAME[frame]}" - if $extdebug; then - for ((i=argc_index-1; i >= argc_index-argc; i--)); do - printf " %s" "${BASH_ARGV[i]}" - done - fi - echo \' - done - return 0 -} -err-catch() { - set -E; shopt -s extdebug - _err-trap() { - err=$? - exec >&2 - set +x - echo "${BASH_SOURCE[1]}:${BASH_LINENO[0]}: \`$BASH_COMMAND' returned $err" - err-bash-trace 2 - set -e # err trap does not work within an error trap - "${_errcatch_cleanup[@]:-:}" # note :-: is to be compatible with set -u - echo "$0: exiting with code $err" - exit $err - } - trap _err-trap ERR - set -o pipefail -} -err-catch +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" -[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@" - +source /usr/local/lib/err usage() { cat <<'EOF' @@ -85,9 +42,11 @@ rsync-dirs() { } -pre="${0##*/}:" -m() { if $verbose; then printf "$pre %s\n" "$*"; fi; "$@"; } -die() { printf "$pre %s\n" "$*" >&2; exit 1; } +pre="${0##*/}: " +m() { if $verbose; then printf "$pre%s\n" "$*"; fi; "$@"; } +e() { printf "$pre%s\n" "$*"; } +die() { printf "$pre%s\n" "$*" >&2; echo "exiting with status 1" >&2; exit 1; } +mexit() { echo "$pre: exiting with status $1"; exit $1; } # latest $MAIL_HOST if [[ -e /b/bash_unpublished/source-state ]]; then @@ -100,12 +59,14 @@ mountpoints=() rsync_mountpoint=/q +ret=0 # default options conf_only=false dry_run=false # mostly for testing rate_limit=no verbose=true; verbose_arg=-v progress_arg="--progress" +incremental_strict=true pull_reexec=false default_args_file=/etc/btrbk-run.conf @@ -119,7 +80,7 @@ fi cron=false orig_args=("$@") -temp=$(getopt -l cron,pull-reexec,help cl:m:npqs:t:vh "$@") || usage 1 +temp=$(getopt -l cron,pull-reexec,help cil:m:npqs:t:vh "$@") || usage 1 eval set -- "$temp" while true; do case $1 in @@ -130,6 +91,7 @@ while true; do ;; # only creates the config file, does not run btrbk -c) conf_only=true; shift ;; + -i) incremental_strict=false; shift ;; # bytes per second, suffix k m g -l) rate_limit=$2; shift 2 ;; # Comma separated mountpoints to backup. This has defaults set below. @@ -167,10 +129,15 @@ if [[ -v targets && $source ]]; then fi if $verbose; then - printf "$pre options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg" + printf "options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg" fi ### end options parsing +if ! btrbk --version |& grep 0.29.0 >/dev/null; then + cd /a/opt/btrbk + m sudo make install +fi + # TODO: i wonder if there should be an option to send to the default # targets, plus any given on the command line. @@ -178,35 +145,48 @@ fi if [[ ! -v targets && ! $source ]]; then if [[ $HOSTNAME != "$MAIL_HOST" ]] && $cron ; then echo "MAIL_HOST=$MAIL_HOST, nothing to do" - exit 0 + mexit 0 fi + + at_work=false + case $HOSTNAME in - kw|x2) - if ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then + kw) + at_work=true + ;;& + x2|x3) + if ping -q -c1 -w1 hal.office.fsf.org \ + && ip n show 192.168.0.26 | grep . &>/dev/null; then + at_work=true + fi + ;;& + kw|x2|x3) + if $at_work && ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then home=iank.vpn.office.fsf.org else home=b8.nz fi ;;& kw) - targets=($home x2) + targets=($home x3) ;; - x2) + x2|x3) targets=($home kw) ;; tp) # kd disabled temporarily while its hot and i plan to work on it. #targets=(frodo kd) + #targets=(frodo x2.b8.nz) targets=(frodo) # might not be connected to the vpn - if timeout -s 9 10 ssh kw :; then + if timeout -s 9 6 ssh kw :; then targets+=(kw) fi ;; kd) targets=(frodo tp) # might not be connected to the vpn - if timeout -s 9 10 ssh kw :; then + if timeout -s 9 6 ssh kw :; then targets+=(kw) fi ;; @@ -256,7 +236,7 @@ else esac for mp in ${prospective_mps[@]}; do # default mountpoints to sync if [[ -e /nocow/btrfs-stale/$mp ]]; then - echo "$pre warning: $mp stale, not adding to default mountpoints" + e "warning: $mp stale, not adding to default mountpoints" continue fi if awk '{print $2}' /etc/fstab | grep -xF $mp &>/dev/null; then @@ -272,7 +252,7 @@ echo "mountpoints: ${mountpoints[*]}" if [[ $source ]]; then if [[ $(ssh $source systemctl is-active btrbk.service) != inactive ]]; then echo "$0: error: cron btrbk is running on source. exiting out of caution" - exit 1 + mexit 1 fi fi @@ -289,17 +269,16 @@ if ! $pull_reexec && [[ $source ]] && $pulla ; then tmpf=$(mktemp) scp $source:/a/bin/distro-setup/btrbk-run $tmpf if ! diff -q $tmpf $BASH_SOURCE; then - echo "$pre found newer version on host $source. reexecing" + e "found newer version on host $source. reexecing" install -T $tmpf /usr/local/bin/btrbk-run m /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}" - exit + mexit 0 fi fi - if ! which btrbk &>/dev/null; then die "error: no btrbk binary found" fi @@ -326,12 +305,17 @@ else min_idle_ms=$((1000 * 60 * 15)) for h in ${targets[@]}; do if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then - if $cron && DISPLAY=:0 xprintidle; then - # This is a separate ssh because xprintidle can fail and thats ok. - # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that - # everything will be wiped by the next backup, but I dont want it to happen as Im using - # it from cronjob. - continue + # This is a separate ssh because xprintidle can fail and thats ok. + if $cron && idle_ms=$(timeout -s 9 6 ssh $h DISPLAY=:0 xprintidle); then + if (( idle_ms < min_idle_ms )); then + + # Ignore this host. i sometimes use a non-main machine for + # testing or web browsing, knowing that everything will be wiped + # by the next backup, but I dont want it to happen as Im using + # it from cronjob. + e "warning: $h: active X session in the last 15 minutes, skipping for now" + continue + fi fi sshable+=($h) if [[ $zone != $local_zone ]]; then @@ -341,12 +325,12 @@ else sshfail+=($h) fi done - if [[ ! $sshable ]] || { ! $cron && [[ $sshfail ]]; }; then + if [[ ! ${sshable[@]} ]] || { ! $cron && [[ ${sshfail[@]} ]]; }; then die "failed to ssh to hosts: ${sshfail[*]}" else - if [[ $sshfail ]]; then + if [[ ${sshfail[@]} ]]; then ret=1 - echo "$pre error: failed to ssh to ${sshfail[*]} but continuing with other hosts" + e "error: failed to ssh to ${sshfail[*]} but continuing with other hosts" fi targets=(${sshable[@]}) fi @@ -392,9 +376,11 @@ target_preserve_min 4h rate_limit $rate_limit EOF - - - +if $incremental_strict; then + cat >>/etc/btrbk.conf </dev/null; then fi if [[ $source ]]; then - m mount-latest-subvol $verbose_arg + m mount-latest-subvol else m /a/exe/mount-latest-remote ${targets[@]} fi -exit $ret +mexit $ret # todo: move variable data we don't care about backing up # to /nocow and symlink it.