lots of updates

[distro-setup] / btrbk-run

diff --git a/btrbk-run b/btrbk-run
index eb8a7b5db7e9c89ea051095f55399de541d7e31d..47138209f716975aede08790862bf7bd1035f734 100755 (executable)
--- a/btrbk-run
+++ b/btrbk-run
@@ -38,33 +38,40 @@ rsync_mountpoint=/q
 conf_only=false
 dry_run=false # mostly for testing
 resume_arg=
+rate_limit=no
+verbose=false
 
 default_args_file=/etc/btrbk-run.conf
 if [[ -s $default_args_file ]]; then
-    echo "$0: warning: options file default options set:"
-    cat $default_args_file
-    sleep 5
     set -- $(< $default_args_file) "$@"
 fi
 
-temp=$(getopt -l help hcm:nprt: "$@") || usage 1
+temp=$(getopt -l help cl:m:nprt:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -c) conf_only=true; shift ;;
+        -l) rate_limit=$2; shift 2 ;;
         -m) IFS=, mountpoints=($2); unset IFS; shift 2 ;;
         -n) dry_run=true; dry_run_arg=-n; shift ;;
         -p) progress_arg="--progress"; shift ;;
         # btrbk arg: Resume only. Skips snapshot creation.
         -r) resume_arg=-r; shift ;;
         -t) IFS=, targets=($2); unset IFS; shift 2 ;;
+        -v) verbose=true; verbose_arg=-v; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;
     esac
 done
 
-echo "$0: options: conf_only=$conf_only, dry_run=$dry_run, resume_arg=$resume_arg"
+if [[ -s $default_args_file ]]; then
+    echo "$0: warning: default btrbk-run options set in $default_args_file (sleeping 5 seconds):"
+    cat $default_args_file
+    sleep 5
+fi
+
+echo -e "$0: options: conf_only=$conf_only\ndry_run=$dry_run\nresume_arg=$resume_arg\nrate_limit=$rate_limit\nverbose=$verbose"
 
 # set default targets
 if ! (( ${#targets[@]} )); then
@@ -93,8 +100,14 @@ echo "targets: ${targets[*]}"
 
 
 
-# set default mountpoints
-if ! (( ${#mountpoints[@]} )); then
+if (( ${#mountpoints[@]} )); then
+    for mp in ${mountpoints[@]}; do
+        if [[ -e /nocow/btrfs-stale/$mp ]]; then
+            echo "$0: warning: $mp stale. Sleeping for 3 seconds in case you want to cancel."
+            sleep 3
+        fi
+    done
+else # set default mountpoints
     prospective_mps=(/a /q)
     if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
         prospective_mps+=(/o)
@@ -105,6 +118,10 @@ if ! (( ${#mountpoints[@]} )); then
         fi
     done
     for mp in ${prospective_mps[@]}; do # default mountpoints to sync
+        if [[ -e /nocow/btrfs-stale/$mp ]]; then
+            echo "$0: warning: $mp stale, not adding to default mountpoints"
+            continue
+        fi
         if awk '{print $2}' /etc/fstab | grep -xF $mp &>/dev/null; then
             mountpoints+=($mp)
         fi
@@ -143,7 +160,7 @@ if ! which btrbk &>/dev/null; then
     echo "$0: error: no btrbk binary found"
 fi
 
-cat >/etc/btrbk.conf <<'EOF'
+cat >/etc/btrbk.conf <<EOF
 ssh_identity /root/.ssh/id_rsa
 # Just a guess that local7 is a good facility to pick.
 # It's a bit odd that the transaction log has to be logged to
@@ -174,6 +191,8 @@ target_preserve_min 4h
 
 # if something fails and it's not obvious, try doing
 # btrbk -l debug -v dryrun
+
+rate_limit $rate_limit
 EOF
 
 
@@ -218,11 +237,11 @@ if $conf_only; then
 fi
 
 if $dry_run; then
-    m btrbk -n $resume_arg run
+    m btrbk -v -n $resume_arg run
 else
     # -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 $progress_arg $resume_arg run
+    m btrbk $verbose_arg $progress_arg $resume_arg run
 fi
 
 # if we have it, sync to systems which don't