X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=f8618809e859ddbbbf378b86a56624c00a70c7b4;hb=c5021d1e8ad29f946b28d7a22d959e691e28bf32;hp=f768ad4ffff561c65bf1d67ac3d8d9a02a9b74d6;hpb=541688fb965b26a16cda0801591df64551c51115;p=distro-setup

diff --git a/btrbk-run b/btrbk-run
index f768ad4..f861880 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -65,6 +65,7 @@ conf_only=false
 dry_run=false # mostly for testing
 rate_limit=no
 verbose=true; verbose_arg=-v
+force=false
 if [[ $INVOCATION_ID ]]; then
   # INVOCATION_ID means running as a systemd service. we cant show progress in this case,
   # but if we pass the arg, it will insert mbuffer into the command.
@@ -89,9 +90,9 @@ targets=()
 early=false
 cron=false
 fast=false
-kd_spread_maybe=false
+kd_spread=false
 orig_args=("$@")
-temp=$(getopt -l cron,fast,pull-reexec,help 23ceikl:m:npqrs:t:vh "$@") || usage 1
+temp=$(getopt -l cron,fast,pull-reexec,help 23cefikl:m:npqrs:t:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -110,19 +111,20 @@ while true; do
     -c) conf_only=true ;;
     # quit early, just btrbk, no extra remounting etc.
     -e) early=true ;;
+    -f) force=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 ;;
-    # note this implies resume
-    -k) kd_spread_maybe=true ;;
+    # note this implies resume, cron and -p
+    -k) kd_spread=true ;;
     # bytes per second, suffix k m g
     -l) rate_limit=$2; shift ;;
     # Comma separated mountpoints to backup. This has defaults set below.
     -m) IFS=, mountpoints=($2); unset IFS; shift ;;
     -n) dry_run=true ;;
-    # hide progress
-    -p) progress_arg= ;;
+    # preserve existing snapshots and backups
+    -p) preserve_arg=-p ;;
     # internal option for rerunning under newer SOURCE_HOST version.
     --pull-reexec) pull_reexec=true;;
     # quiet
@@ -148,15 +150,23 @@ while true; do
   shift
 done
 
-if $kd_spread_maybe; then
-  if [[ $1 && $1 != resume ]]; then
+cmd_arg="$1"
+
+if $kd_spread; then
+  if [[ $cmd_arg && $cmd_arg != resume ]]; then
     die "dont pass -k without resume or empty run arg"
   fi
+  if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
+    die "something went wrong, -k not meant to be run on MAIL_HOST"
+  fi
   cmd_arg=resume
+  preserve_arg=-p
+  cron=true
 fi
 
-
-cmd_arg=${1:-run}
+if [[ ! $cmd_arg ]]; then
+  cmd_arg=run
+fi
 
 
 std_preserve="36h 14d 8w 24m"
@@ -209,36 +219,11 @@ fi
 # targets, plus any given on the command line.
 
 
-
-kd_spread=false
 # set default targets
 if [[ ! -v targets && ! $source ]]; then
-  if $cron; then
-    if [[ $HOSTNAME != "$MAIL_HOST" ]]; then
-      if $kd_spread_maybe && [[ $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
-      fi
-    fi
+  if $cron && ! $kd_spread && [[ $HOSTNAME != "$MAIL_HOST" ]]; then
+    echo "MAIL_HOST=$MAIL_HOST, nothing to do"
+    mexit 0
   fi
 
   at_work=false
@@ -280,30 +265,24 @@ if [[ ! -v targets && ! $source ]]; then
             targets+=(x3wg.b8.nz)
           fi
         fi
-        # temporarily disabled while doing recovery
-        #        for h in frodo kd; do
-        for h in kd; do
-          if [[ $HOSTNAME == "$h" ]]; then
-            continue
-          fi
-          targets+=($h.b8.nz)
-        done
-        for h in x2 sy; do
-          if [[ $HOSTNAME == "$h" ]]; then
-            continue
-          fi
-          if ping -q -c1 -w1 $h.b8.nz &>/dev/null; then
-            targets+=($h.b8.nz)
-          elif ping -q -c1 -w1 ${h}w.b8.nz &>/dev/null; then
-            targets+=(${h}w.b8.nz)
+        if [[ $HOSTNAME != kd ]]; then
+          targets+=(kd.b8.nz)
+        fi
+        wireless_home_hosts=(
+          x2
+          sy
+        )
+        for h in ${wireless_home_hosts[@]}; do
+          if [[ $HOSTNAME != "$h" ]]; then
+            if ping -q -c1 -w1 $h.b8.nz &>/dev/null; then
+              targets+=($h.b8.nz)
+            elif ping -q -c1 -w1 ${h}w.b8.nz &>/dev/null; then
+              targets+=(${h}w.b8.nz)
+            fi
           fi
         done
       elif $at_work; then
-        if ping -q -c1 -w1 iank.vpn.office.fsf.org &>/dev/null; then
-          targets+=(iank.vpn.office.fsf.org)
-        else
-          targets+=(i.b8.nz)
-        fi
+        targets+=(i.b8.nz)
         for h in x2 x3 kw; do
           if [[ $HOSTNAME == "$h" ]]; then
             continue
@@ -319,19 +298,6 @@ if [[ ! -v targets && ! $source ]]; then
   esac
 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"
-fi
-
-
-if [[ -v targets ]]; then
-  echo "targets: ${targets[*]}"
-fi
-
-if [[ $source ]]; then
-  echo "source: $source"
-fi
-
 if [[ ${mountpoints[0]} ]]; then
   for mp in ${mountpoints[@]}; do
     if [[ -e /nocow/btrfs-stale/$mp ]]; then
@@ -354,17 +320,17 @@ else
             prospective_mps+=(/o)
           fi
           if [[ $source_host == "$HOST2" ]]; then
-            prospective_mps+=(/a /ar /qr /q)
+            prospective_mps+=(/a /ar /qr /qd /q)
           fi
         else
           if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
             prospective_mps+=(/o)
           fi
           if [[ $HOSTNAME == "$HOST2" ]]; then
-            prospective_mps+=(/a /ar /qr /q)
+            prospective_mps+=(/a /ar /qr /qd /q)
           fi
           if $kd_spread; then
-            prospective_mps=(/a /ar /o /qr /q)
+            prospective_mps=(/a /ar /o /qr /qd /q)
           fi
         fi
         # note: put q last just in case its specific retention options were to
@@ -387,10 +353,10 @@ if (( ! ${#mountpoints[@]} )); then
   die didnt get mountpoint arg and had no defaults
 fi
 
-echo "mountpoints: ${mountpoints[*]}"
-
 ##### end command line parsing ########
 
+#### begin pre-checks #####
+
 # todo: this has a timing problem, since btrbk.timer could activate the service after this check.
 if ! $fast && [[ $source ]]; then
   if [[ $(ssh $source ps --no-headers -o comm 1) == systemd ]]; then
@@ -404,6 +370,38 @@ if ! $fast && [[ $source ]]; then
   fi
 fi
 
+if ! command -v btrbk &>/dev/null; then
+  die "error: no btrbk binary found"
+fi
+
+
+#### end pre-checks #####
+
+mkdir -p /var/log/btrbk
+# The journal doesnt go back to my oldest backups, and I've found myself
+# wanting older logs. Not going to bother expiring old logs, since it is
+# fine if they go back years.
+log_path=/var/log/btrbk/$(date +%F_%T%:::z).log
+echo copying output to $log_path
+exec &> >(ts "%F %T" | tee -a $log_path)
+
+
+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"
+fi
+
+if [[ -v targets ]]; then
+  echo "targets: ${targets[*]}"
+fi
+
+if [[ $source ]]; then
+  echo "source: $source"
+fi
+
+echo "mountpoints: ${mountpoints[*]}"
+
+
+
 # pull_reexec stops us from getting into an infinite loop if there is some
 # kind of weird problem
 pulla=false
@@ -427,10 +425,6 @@ if ! $pull_reexec && [[ $source ]] && $pulla ; then
 fi
 
 
-if ! command -v btrbk &>/dev/null; then
-  die "error: no btrbk binary found"
-fi
-
 if ! $fast; then
   # if our mountpoints are from stale snapshots,
   # it doesn't make sense to do a backup.
@@ -501,7 +495,7 @@ else
     # which is good enough.
     #
     # This is a separate ssh because the command can fail and thatis ok.
-    if $cron; then
+    if $cron && ! $force; then
       locked=false
       if lock_info=$(timeout -s 9 6 ssh $h DISPLAY=:0 xscreensaver-command -time); then
         if [[ $lock_info != *non-blanked* ]]; then
@@ -510,7 +504,7 @@ else
       else
         locked=true
       fi
-      if $locked; then
+      if ! $locked; 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
@@ -563,11 +557,11 @@ snapshot_create onchange
 # if one disk had less space.
 # for now, keeping them equal.
 snapshot_preserve $std_preserve
-snapshot_preserve_min 2h
+snapshot_preserve_min 6h
 snapshot_dir btrbk
 # so, total backups = ~58
 target_preserve $std_preserve
-target_preserve_min 2h
+target_preserve_min 6h
 
 # i tried this when investigating: clone no source subvolume found error
 #incremental_prefs sro:1 srn:1 sao san:1 aro:1 arn:1
@@ -702,9 +696,16 @@ fi
 
 if [[ $ret == 0 ]]; then
   for tg in ${targets[@]}; do
-    :
-    #ssh root@$tg /a/exe/mail-backup-clean
+    h=$(ssh $tg hostname)
+    if [[ $h == kd && $HOSTNAME == x3 && $HOSTNAME == "$MAIL_HOST" ]]; then
+      ssh root$tg systemctl --no-block start btrbk-spread
+    fi
+    rsync -a -f"- */" -f"+ *" /var/log/btrbk/ root@$tg:/var/log/btrbk/$tg
+    ssh root@$tg /usr/local/bin/mail-backup-clean
   done
+  if [[ $source ]]; then
+    rsync -a -f"- */" -f"+ *" $source:/var/log/btrbk/ /var/log/btrbk/$source
+  fi
 fi
 
 mexit $ret