fixes and improvements

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index b3a32071fabaea9803808743b305e0c6de024d99..8a310e61e931e495ef0700c64128e56dac1fab9e 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -76,13 +76,18 @@ if [[ -s $default_args_file ]]; then
   sleep 5
 fi
 
-early=false # quit early, just btrbk, no extra remounting etc.
+marchive=false
+early=false
 cron=false
 orig_args=("$@")
 temp=$(getopt -l cron,pull-reexec,help ceil:m:npqrs:t:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
+    # some behaviors specific to running under cron:
+    # - skip hosts where xprintidle haven't been idle recently
+    # - if we can't ssh to 1 or more hosts, still do the rest
+    # - if we aren't MAIL_HOST and no -m or -s, just exit
     --cron)
       cron=true
       pre=
@@ -90,6 +95,7 @@ while true; do
       ;;
     # only creates the config file, does not run btrbk
     -c) conf_only=true; shift ;;
+    # quit early, just btrbk, no extra remounting etc.
     -e) early=true; shift ;;
     -i) incremental_strict=true; shift ;;
     # bytes per second, suffix k m g
@@ -97,9 +103,11 @@ while true; do
     # Comma separated mountpoints to backup. This has defaults set below.
     -m) IFS=, mountpoints=($2); unset IFS; shift 2 ;;
     -n) dry_run=true; dry_run_arg=-n; shift ;;
+    # show progress
     -p) progress_arg="--progress"; shift ;;
+    # internal option for rerunning under newer SOURCE_HOST version.
     --pull-reexec) pull_reexec=true; shift ;;
-    -r) archive=false; shift ;;
+    # quiet
     -q) verbose=false; verbose_arg=; progress_arg=; shift ;;
     # source host to receive a backup from
     -s)
@@ -113,6 +121,7 @@ while true; do
     # target hosts to send to. empty is valid for just doing local
     # snapshot. we have default hosts we will populate.
     -t) IFS=, targets=($2); unset IFS; shift 2 ;;
+    # verbose.
     -v) verbose=true; verbose_arg=-v; shift ;;
     -h|--help) usage ;;
     --) shift; break ;;
@@ -123,8 +132,19 @@ done
 # only tested commands are resume and archive
 cmd_arg=${1:-run}
 
+
+std_preserve="18h 14d 8w 24m"
+q_preserve="18h 14d"
+
 case $cmd_arg in
   run|resume|archive) : ;;
+  marchive)
+    marchive=true
+    cmd=resume
+    std_preserve="999h 999d 999w 999m"
+    q_preserve="$std_preserve"
+    preserve_arg=-p
+    ;;
   *) die "untested command arg" ;;
 esac
 
@@ -143,6 +163,8 @@ if $verbose; then
 fi
 ### end options parsing
 
+declare -A vols
+
 # remove path from earlier version of btrbk
 rm -f /usr/sbin/btrbk
 # note, this still works as intended if there is no /usr/bin/btrbk
@@ -423,11 +445,11 @@ snapshot_create onchange
 # I could make this different from target_preserve,
 # if one disk had less space.
 # for now, keeping them equal.
-snapshot_preserve 18h 14d 8w 24m
+snapshot_preserve $std_preserve
 snapshot_preserve_min 2h
 snapshot_dir btrbk
 # so, total backups = ~58
-target_preserve 18h 14d 8w 24m
+target_preserve $std_preserve
 target_preserve_min 2h
 
 # if something fails and it's not obvious, try doing
@@ -446,9 +468,11 @@ for m in ${mountpoints[@]}; do
   case $m in
     /o)
       vol=/mnt/o
+      vols[$vol]=t
       ;;
     *)
       vol=/mnt/root
+      vols[$vol]=t
       ;;
   esac
 
@@ -469,10 +493,10 @@ EOF
       q)
         # q has sensitive data i dont want to backup for so long
         cat >>/etc/btrbk.conf <<EOF
-snapshot_preserve 18h 14d
+snapshot_preserve $std_preserve
 snapshot_preserve_min 2h
 snapshot_dir btrbk
-target_preserve 18h 14d
+target_preserve $std_preserve
 target_preserve_min 2h
 EOF
         ;;
@@ -514,17 +538,21 @@ if $dry_run; then
   mexit 0
 elif [[ $cmd_arg == archive ]]; then
   if [[ $source ]]; then
-    m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
+    for vol in ${!vols[@]}; do
+      m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
+    done
   else
     for tg in ${targets[@]}; do
-      m btrbk $verbose_arg $progress_arg $cmd_arg $vol ssh://$tg$vol
+      for vol in ${!vols[@]}; do
+        m btrbk $verbose_arg $progress_arg $cmd_arg $vol ssh://$tg$vol
+      done
     done
   fi
   mexit 0
 fi
 # -q and just using the syslog option seemed nice,
 # but it doesn't show when a send has a parent and when it doesn't.
-m btrbk $verbose_arg $progress_arg $cmd_arg
+m btrbk $preserve_arg $verbose_arg $progress_arg $cmd_arg
 
 # todo: tp not valid anymore.
 # if we have it, sync to systems which don't