Compare commits

...

6 Commits

Author SHA1 Message Date
a5600ff6e6
Fixed missing space. 2023-01-17 00:41:22 -05:00
e3a1897e9c
Fixed missing quotes. 2023-01-17 00:39:31 -05:00
2573fb8847
Removed unused argument. 2023-01-17 00:06:25 -05:00
679b6fc1a8
Moved pv_cmd setup. 2023-01-17 00:05:31 -05:00
f7a43122d1
Fixed typo. 2023-01-17 00:02:50 -05:00
88258df653
Cleaned up whitespace. 2023-01-17 00:01:50 -05:00

View File

@ -44,7 +44,8 @@ debug()
run_send_recv()
{
ssh_cmd="ssh $SSH_SEND_OPTS -o port=$port $user@$addr"
if [ $ZB_TEST_MODE = "TRUE" ]; then
pv_cmd="pv -qL ${speed:-$DEFAULT_SPEED}"
if [ "$ZB_TEST_MODE" = "TRUE" ]; then
echo "$send_cmd | $pv_cmd | $ssh_cmd $recv_cmd"
else
$send_cmd | $pv_cmd | $ssh_cmd $recv_cmd
@ -53,7 +54,7 @@ run_send_recv()
run_snapshot()
{
if [ $ZB_TEST_MODE = "TRUE" ]; then
if [ "$ZB_TEST_MODE" = "TRUE" ]; then
echo zfs snapshot $ZFS_SNAPSHOT_OPTS $dset@$snapid
else
zfs snapshot $ZFS_SNAPSHOT_OPTS $dset@$snapid
@ -62,7 +63,7 @@ run_snapshot()
run_allow()
{
if [ $ZB_TEST_MODE = "TRUE" ]; then
if [ "$ZB_TEST_MODE" = "TRUE" ]; then
echo zfs allow -u $LOCAL_USER $ORIGIN_PERMS $dset
else
zfs allow -u $LOCAL_USER $ORIGIN_PERMS $dset
@ -72,7 +73,7 @@ run_allow()
run_remote()
{
ssh_cmd="ssh $SSH_SEND_OPTS -o port=$port $user@$addr"
if [ $ZB_TEST_MODE = "TRUE" ]; then
if [ "$ZB_TEST_MODE" = "TRUE" ]; then
echo "\`$ssh_cmd $remote_cmd\`"
else
$ssh_cmd $remote_cmd
@ -80,7 +81,7 @@ run_remote()
}
set_compression() {
case $SEND_COMPRESSED in
case "$SEND_COMPRESSED" in
[tTyY]*) ZFS_SEND_OPTS="$ZFS_SEND_OPTS -c"
debug "Enabled send as compressed datasets." ;;
esac
@ -89,14 +90,14 @@ set_compression() {
populate_datasets()
{
while read dset dataset_options; do
case $dset in
case "$dset" in
\#*) continue;;
esac
snapshot_dataset="yes"
send_dataset="yes"
for option in $dataset_options; do
case $option in
case "$option" in
"nosnap"* )
snapshot_dataset=""
;;
@ -132,8 +133,8 @@ list_datasets()
list_remote_datasets() {
while read addr user port zroot speed; do
echo "=== $user@$addr $zroot ==="
if [ $zroot ]; then
case $zroot in
if [ "$zroot" ]; then
case "$zroot" in
*"/") ;;
*) zroot="$zroot/" ;;
esac
@ -156,7 +157,7 @@ get_latest_snapshot()
get_latest_remote_snapshot()
{
if [ $zroot ]; then
case $zroot in
case "$zroot" in
*"/") ;;
*) zroot="$zroot/" ;;
esac
@ -164,7 +165,6 @@ get_latest_remote_snapshot()
list_cmd="zfs list -t snapshot $zroot$dset"
remote_cmd="$list_cmd|tail -n1|cut -d'@' -f2|cut -d' ' -f 1"
run_remote
}
zfs_allow_origin()
@ -179,8 +179,8 @@ zfs_allow_mirrors()
{
while read addr user port zroot speed; do
echo "=== $user@$addr $zroot ==="
if [ $zroot ]; then
case $zroot in
if [ "$zroot" ]; then
case "$zroot" in
*"/") ;;
*) zroot="$zroot/" ;;
esac
@ -200,7 +200,7 @@ create_snapshots()
snapid="`date -I`-`date +%s`-$LOCAL_TZ"
for dset in $SNAPSHOT_DATASETS; do
run_snapshot
debug Created snapshot $dset@$snapid.
debug "Created snapshot $dset@$snapid."
done
}
@ -208,8 +208,8 @@ send_latest()
{
while read addr user port zroot speed; do
echo "=== $user@$addr $zroot ==="
if [ $zroot ]; then
case $zroot in
if [ "$zroot" ]; then
case "$zroot" in
*"/") ;;
*) zroot="$zroot/" ;;
esac
@ -218,9 +218,8 @@ send_latest()
rset=`echo $dset|cut -d: -f2`
dset=`echo $dset|cut -d: -f1`
debug "Processing $dset (remote $rset)."
snap1=`get_latest_snapshot $dset`
snap1=`get_latest_snapshot`
send_cmd="zfs send $ZFS_SEND_OPTS $dset@$snap1"
pv_cmd="pv -qL ${speed:-$DEFAULT_SPEED}"
recv_cmd="zfs recv $ZFS_RECV_OPTS $zroot$rset"
run_send_recv
done
@ -231,8 +230,8 @@ send_increment()
{
while read addr user port zroot speed; do
echo "=== $user@$addr $zroot ==="
if [ $zroot ]; then
case $zroot in
if [ "$zroot" ]; then
case "$zroot" in
*"/") ;;
*) zroot="$zroot/" ;;
esac
@ -243,7 +242,6 @@ send_increment()
snap1=`get_latest_snapshot`
snap0=`get_latest_remote_snapshot`
send_cmd="zfs send $ZFS_SEND_OPTS -i $dset@$snap0 $dset@$snap1"
pv_cmd="pv -qL ${speed:-$DEFAULT_SPEED}"
recv_cmd="zfs recv $ZFS_RECV_OPTS $zroot$rset"
run_send_recv
done
@ -253,12 +251,11 @@ send_increment()
################################### MAIN ####################################
### Options
set -- `getopt "tvl:" "$@"` || {
echo "Usage: `basename $0` [-tvl] [command]" 1>&2
exit 1
}
ZB_TEST_MODE=FALSE
while :; do
case "$1" in
-t)
@ -270,7 +267,7 @@ while :; do
ZFS_SEND_OPTS="$ZFS_SEND_OPTS -v"
# Current on by default.
# ZFS_RECV_OPTS="$ZFS_RECV_OPTS -v"
debug "Enabled terbose mode."
debug "Enabled verbose mode."
;;
--) shift; break ;;
esac