iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes and improvements
[distro-setup]
/
btrbk-run
diff --git
a/btrbk-run
b/btrbk-run
index 1137a72b9c85bc434bf7168ea46c331cd8c7016f..8a310e61e931e495ef0700c64128e56dac1fab9e 100644
(file)
--- a/
btrbk-run
+++ b/
btrbk-run
@@
-76,13
+76,18
@@
if [[ -s $default_args_file ]]; then
sleep 5
fi
sleep 5
fi
-early=false # quit early, just btrbk, no extra remounting etc.
+marchive=false
+early=false
cron=false
orig_args=("$@")
cron=false
orig_args=("$@")
-temp=$(getopt -l cron,pull-reexec,help ceil:m:npqs:t:vh "$@") || usage 1
+temp=$(getopt -l cron,pull-reexec,help ceil:m:npq
r
s:t:vh "$@") || usage 1
eval set -- "$temp"
while true; do
case $1 in
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=
--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 ;;
;;
# 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
-e) early=true; shift ;;
-i) incremental_strict=true; shift ;;
# bytes per second, suffix k m g
@@
-97,8
+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 ;;
# 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 ;;
-p) progress_arg="--progress"; shift ;;
+ # internal option for rerunning under newer SOURCE_HOST version.
--pull-reexec) pull_reexec=true; shift ;;
--pull-reexec) pull_reexec=true; shift ;;
+ # quiet
-q) verbose=false; verbose_arg=; progress_arg=; shift ;;
# source host to receive a backup from
-s)
-q) verbose=false; verbose_arg=; progress_arg=; shift ;;
# source host to receive a backup from
-s)
@@
-112,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 ;;
# 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 ;;
-v) verbose=true; verbose_arg=-v; shift ;;
-h|--help) usage ;;
--) shift; break ;;
@@
-122,8
+132,19
@@
done
# only tested commands are resume and archive
cmd_arg=${1:-run}
# 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) : ;;
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
*) die "untested command arg" ;;
esac
@@
-142,6
+163,8
@@
if $verbose; then
fi
### end options parsing
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
# 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
@@
-172,7
+195,7
@@
if [[ ! -v targets && ! $source ]]; then
targets=(frodo.b8.nz)
case $HOSTNAME in
targets=(frodo.b8.nz)
case $HOSTNAME in
- kw)
+
x2|
kw)
at_work=true
;;&
x2|x3|sy|bo)
at_work=true
;;&
x2|x3|sy|bo)
@@
-193,18
+216,18
@@
if [[ ! -v targets && ! $source ]]; then
fi
;;&
kw)
fi
;;&
kw)
- targets+=($home x
3
)
+ targets+=($home x
2.office.fsf.org
)
;;
x2|x3|sy|bo)
targets+=($home)
if $at_work; then
;;
x2|x3|sy|bo)
targets+=($home)
if $at_work; then
- targets+=(
kw
.office.fsf.org x2.b8.nz)
+ targets+=(
x2
.office.fsf.org x2.b8.nz)
else
else
- targets+=(
kw
.b8.nz)
+ targets+=(
x2wg
.b8.nz)
fi
;;
kd)
fi
;;
kd)
- targets+=(x2
.b8.nz kw
.b8.nz)
+ targets+=(x2
wg.b8.nz x3
.b8.nz)
if ping -q -c1 -w1 sy.b8.nz &>/dev/null; then
targets+=(sy.b8.nz)
else
if ping -q -c1 -w1 sy.b8.nz &>/dev/null; then
targets+=(sy.b8.nz)
else
@@
-265,7
+288,7
@@
else
fi
# note: put q last just in case its specific retention options were to
# affect other config sections. I havent tested if that is the case.
fi
# note: put q last just in case its specific retention options were to
# affect other config sections. I havent tested if that is the case.
- prospective_mps+=(/a /q)
+ prospective_mps+=(/a /
ar /qr /
q)
;;
esac
fi
;;
esac
fi
@@
-319,7
+342,7
@@
if ! $pull_reexec && [[ $source ]] && $pulla ; then
fi
fi
-if !
which
btrbk &>/dev/null; then
+if !
command -v
btrbk &>/dev/null; then
die "error: no btrbk binary found"
fi
# if our mountpoints are from stale snapshots,
die "error: no btrbk binary found"
fi
# if our mountpoints are from stale snapshots,
@@
-327,7
+350,7
@@
fi
check-subvol-stale ${mountpoints[@]} || die "found stale mountpoints in ${mountpoints[*]}"
# for an initial run, btrbk requires the dir to exist.
check-subvol-stale ${mountpoints[@]} || die "found stale mountpoints in ${mountpoints[*]}"
# for an initial run, btrbk requires the dir to exist.
-mkdir -p /mnt/
root
/btrbk
+mkdir -p /mnt/
{root,o}
/btrbk
local_zone=$(date +%z)
if [[ $source ]]; then
local_zone=$(date +%z)
if [[ $source ]]; then
@@
-344,7
+367,7
@@
else
sshfail=()
min_idle_ms=$((1000 * 60 * 15))
for h in ${targets[@]}; do
sshfail=()
min_idle_ms=$((1000 * 60 * 15))
for h in ${targets[@]}; do
- if remote_info=( $(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z && df --output=size,pcent / | tail -n1") ); then
+ if remote_info=( $(timeout -s 9 6 ssh root@$h "mkdir -p /mnt/root/btrbk
/mnt/o/btrbk
&& date +%z && df --output=size,pcent / | tail -n1") ); then
zone=${remote_info[0]}
root_size=${remote_info[1]}
percent_used=${remote_info[2]%%%}
zone=${remote_info[0]}
root_size=${remote_info[1]}
percent_used=${remote_info[2]%%%}
@@
-422,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.
# 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
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
target_preserve_min 2h
# if something fails and it's not obvious, try doing
@@
-441,8
+464,18
@@
incremental strict
EOF
fi
EOF
fi
-vol=/mnt/root
for m in ${mountpoints[@]}; do
for m in ${mountpoints[@]}; do
+ case $m in
+ /o)
+ vol=/mnt/o
+ vols[$vol]=t
+ ;;
+ *)
+ vol=/mnt/root
+ vols[$vol]=t
+ ;;
+ esac
+
sub=${m#/}
if [[ $source ]]; then
cat >>/etc/btrbk.conf <<EOF
sub=${m#/}
if [[ $source ]]; then
cat >>/etc/btrbk.conf <<EOF
@@
-460,14
+493,14
@@
EOF
q)
# q has sensitive data i dont want to backup for so long
cat >>/etc/btrbk.conf <<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
snapshot_preserve_min 2h
snapshot_dir btrbk
-target_preserve
18h 14d
+target_preserve
$std_preserve
target_preserve_min 2h
EOF
;;
target_preserve_min 2h
EOF
;;
-
esac
+ esac
for tg in ${targets[@]}; do
# handle ipv6
if [[ $tg == *:* ]]; then
for tg in ${targets[@]}; do
# handle ipv6
if [[ $tg == *:* ]]; then
@@
-505,17
+538,21
@@
if $dry_run; then
mexit 0
elif [[ $cmd_arg == archive ]]; then
if [[ $source ]]; 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
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.
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
# todo: tp not valid anymore.
# if we have it, sync to systems which don't