X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=f0f16bda44f3013bc48ec4ed10c1c1955cbd8d9c;hb=7b2ec509be2266c4c9f42727e7db4e7fdd63b7ae;hp=0c8dd8b40600052da4a88b696dd0b484740a1e23;hpb=6eab5a709d21f2d58b8f50773a7c34160fc2f5e7;p=distro-setup

diff --git a/btrbk-run b/btrbk-run
old mode 100755
new mode 100644
index 0c8dd8b..f0f16bd
--- a/btrbk-run
+++ b/btrbk-run
@@ -24,18 +24,23 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 usage() {
   cat <<'EOF'
 btrbk-run [OPTIONS]
-usually -t TARGET_HOST
+usually -t TARGET_HOST or -s SOURCE_HOST
+
+Note, at source location, intentionally not executable, run and read
+install-my-scripts.
+
 EOF
   echo "top of script file:"
   sed -n '1,/^[# ]*end command line/{p;b};q' "$0"
   exit $1
 }
 
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+# latest $MAIL_HOST
+if [[ -e /b/bash_unpublished/source-semi-priv ]]; then
+  source /b/bash_unpublished/source-semi-priv
+fi
 
 # note q is owned by root:1000
-# note p/m is owned 1000:1000 and chmod 700
-
 
 mountpoints=()
 
@@ -45,17 +50,20 @@ rsync_mountpoint=/q
 conf_only=false
 dry_run=false # mostly for testing
 rate_limit=no
-verbose=true
-if [[ $- == *i* ]]; then
-  progress_arg="--progress"
-fi
+verbose=true; verbose_arg=-v
+progress_arg="--progress"
+pull_reexec=false
 
 default_args_file=/etc/btrbk-run.conf
 if [[ -s $default_args_file ]]; then
   set -- $(< $default_args_file) "$@"
+  echo "$0: warning: default btrbk-run options set in $default_args_file (sleeping 5 seconds):"
+  cat $default_args_file
+  sleep 5
 fi
 
-temp=$(getopt -l help cl:m:npt:vh "$@") || usage 1
+orig_args=("$@")
+temp=$(getopt -l pull-reexec,help cl:m:nps:t:vh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
@@ -67,7 +75,10 @@ while true; do
     -m) IFS=, mountpoints=($2); unset IFS; shift 2 ;;
     -n) dry_run=true; dry_run_arg=-n; shift ;;
     -p) progress_arg="--progress"; shift ;;
+    --pull-reexec) pull_reexec=true; shift ;;
     -q) verbose=false; verbose_arg=; progress_arg=; shift ;;
+    # source host to receive a backup from
+    -s) source=$2; shift 2 ;;
     # 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 ;;
@@ -81,16 +92,30 @@ done
 # usefull commands are resume and archive
 cmd_arg=${1:-run}
 
-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
+if [[ -v targets && $source ]]; then
+  echo "$0: error: -t and -s are mutually exclusive" >&2
+  exit 1
+fi
+
+# pull_reexec stops us from getting into an infinite loop if there is some
+# kind of weird problem
+if ! $pull_reexec && [[ $source ]]; then
+  tmpf=$(mktemp)
+  scp $source:/a/bin/distro-setup/btrbk-run $tmpf
+  if diff -q $tmpf $BASH_SOURCE; then
+    echo "$0: found newer version on host $source. reexecing"
+    install -T $tmpf /usr/local/bin/btrbk-run
+    /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
+  fi
 fi
 
+
 echo -e "$0: options: conf_only=$conf_only\ndry_run=$dry_run\nrate_limit=$rate_limit\nverbose=$verbose\ncmd_arg=$cmd_arg"
+### end options parsing
+
 
 # set default targets
-if [[ ! -v targets ]]; then
+if [[ ! -v targets && ! $source ]]; then
   case $HOSTNAME in
     x2|kw)
       if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
@@ -115,37 +140,46 @@ if [[ ! -v targets ]]; then
   esac
 fi
 
-echo "targets: ${targets[*]}"
+if [[ -v targets ]]; then
+  echo "targets: ${targets[*]}"
+fi
 
+if [[ $source ]]; then
+  echo "source: $source"
+fi
 
 
-# set default mountpoints
-case $HOSTNAME in
-  frodo)
-    prospective_mps=(/i)
-    ;;
-  *)
-    prospective_mps=(/a /q)
-    if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
-      prospective_mps+=(/o)
+if [[ $mountpoints ]]; then
+  for mp in ${mountpoints[@]}; do # default mountpoints to sync
+    if [[ -e /nocow/btrfs-stale/$mp ]]; then
+      echo "$0: error: $mp is stale, mount-latest-subvol first"
+      exit 1
     fi
-    ;;
-esac
-case ${targets[0]} in
-  kw|kww)
-    prospective_mps=(/a)
-    ;;
-esac
-
-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
-done
+  done
+else
+  # set default mountpoints
+  case $HOSTNAME in
+    # no remote backups atm. note, if we do enable this, configuration below will need some changes.
+    #  frodo)
+    #    prospective_mps=(/i)
+    #    ;;
+    *)
+      prospective_mps=(/a /q)
+      if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
+        prospective_mps+=(/o)
+      fi
+      ;;
+  esac
+  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
+  done
+fi
 
 echo "mountpoints: ${mountpoints[*]}"
 
@@ -157,21 +191,7 @@ rsync-dirs() {
   m rsync $dry_run_arg -ahi --relative --delete "$path" "root@$host:/"
 }
 
-vol-conf() {
-  cat >>/etc/btrbk.conf <<EOF
-volume $vol
-EOF
-}
-sub-conf() {
-  cat >>/etc/btrbk.conf <<EOF
-subvolume $sub
-EOF
-}
-tg-conf() {
-  cat >>/etc/btrbk.conf <<EOF
-target send-receive ssh://$tg$vol/btrbk
-EOF
-}
+
 m() { printf "%s: %s\n" "${0##*/}" "$*";  "$@"; }
 
 
@@ -194,8 +214,9 @@ ssh_identity /root/.ssh/home
 # transaction info.
 transaction_syslog local7
 
-# 20%ish speedup[]
-stream_buffer 512m
+# note, i had this because man said 20% speedup, but ran into
+# this issue, https://github.com/digint/btrbk/issues/275
+#stream_buffer 512m
 
 # so we only run one at a time
 lockfile                   /var/lock/btrbk.lock
@@ -224,30 +245,37 @@ EOF
 
 
 
-for tg in ${targets[@]}; do
-  # for an initial run, btrbk requires the dir to exist.
-  ssh root@$tg mkdir -p /mnt/root/btrbk
+# for an initial run, btrbk requires the dir to exist.
+mkdir -p /mnt/root/btrbk
+local_zone=$(date +%z)
+for h in ${targets[@]} $source; do
+  zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk; date +%z")
+  if [[ $zone != $local_zone ]]; then
+    echo "error: error. dont confuse yourself with multiple time zones. $h has different timezone than localhost" >&2
+    exit 1
+  fi
 done
 
 
 
+vol=/mnt/root
 for m in ${mountpoints[@]}; do
-  # for /i, some special cases. there is just one static target and direction.
-  if [[ $m == /i ]]; then
-    vol=/mnt/iroot
-    vol-conf
-    sub=i
-    sub-conf
-    tg=frodo
-    vol=/mnt/root
-    tg-conf
+  sub=${m##*/}
+  if [[ $source ]]; then
+    cat >>/etc/btrbk.conf <<EOF
+volume ssh://$source$vol
+subvolume $sub
+target send-receive $vol/btrbk
+EOF
   else
-    vol=/mnt/root
-    vol-conf
-    sub=${m##*/}
-    sub-conf
+    cat >>/etc/btrbk.conf <<EOF
+volume $vol
+subvolume $sub
+EOF
     for tg in ${targets[@]}; do
-      tg-conf
+      cat >>/etc/btrbk.conf <<EOF
+target send-receive ssh://$tg$vol/btrbk
+EOF
     done
   fi
 done
@@ -265,21 +293,26 @@ fi
 
 if $dry_run; then
   m btrbk -v -n $cmd_arg
+  exit 0
 elif [[ $cmd_arg == archive ]]; then
+  if [[ $source ]]; then
+    m btrbk $verbose_arg $progress_arg $cmd_arg ssh://$source$vol $vol
+  else
     for tg in ${targets[@]}; do
       m btrbk $verbose_arg $progress_arg $cmd_arg $vol ssh://$tg$vol
     done
-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 $verbose_arg $progress_arg $cmd_arg
+  fi
+  exit 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
 
 # if we have it, sync to systems which don't
 if mountpoint $rsync_mountpoint >/dev/null; then
   for tg in ${targets[@]}; do
     case $tg in
-      tp|li|lk)
+      li|lk)
         for x in /p/c/machine_specific/*.hosts; do
           if grep -qxF $tg $x; then
             dir=${x%.hosts}
@@ -291,11 +324,13 @@ if mountpoint $rsync_mountpoint >/dev/null; then
   done
 fi
 
-if ! $dry_run; then
-  m $script_dir/mount-latest-remote ${targets[@]}
+/a/bin/distro-setup/install-my-scripts
+if [[ $source ]]; then
+  m mount-latest-subvol
+else
+  m /a/exe/mount-latest-remote ${targets[@]}
 fi
 
-
 # todo: move variable data we don't care about backing up
 # to /nocow and symlink it.