Skip to content

Fix propagation of ZREP_INC_FLAG when doing zrep refresh #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janvrany wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix propagation of ZREP_INC_FLAG when doing zrep refresh #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions zrep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2139,10 +2139,10 @@ zrep_refresh(){
fi

if [[ "$BBCP" != "" ]] ; then
$BBCP -N io "$srchost:$ZREP_PATH _refreshpull $newsnap $token" \
$BBCP -N io "$srchost:$ZREP_PATH ${ZREP_R} _refreshpull ${ZREP_INC_FLAG} $newsnap $token" \
"zfs recv $force $destfs"
else
zrep_ssh $srchost "$ZREP_PATH ${ZREP_R} _refreshpull $newsnap $token ${Z_F_OUT}" |
zrep_ssh $srchost "$ZREP_PATH ${ZREP_R} _refreshpull ${ZREP_INC_FLAG} $newsnap $token ${Z_F_OUT}" |
eval ${Z_F_IN} zfs recv $force $destfs
fi
if [[ $? -ne 0 ]] ; then
Expand Down Expand Up @@ -2185,6 +2185,13 @@ _refreshpull(){
typeset fs snapname lastsent latest verbose
typeset token=""

case "$1" in
-i|-I)
ZREP_INC_FLAG=$1
shift
;;
esac

if [[ "$2" != "" ]] ; then
token="$2"
fi
Expand Down
11 changes: 9 additions & 2 deletions zrep_sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,10 @@ zrep_refresh(){
fi

if [[ "$BBCP" != "" ]] ; then
$BBCP -N io "$srchost:$ZREP_PATH _refreshpull $newsnap $token" \
$BBCP -N io "$srchost:$ZREP_PATH ${ZREP_R} _refreshpull ${ZREP_INC_FLAG} $newsnap $token" \
"zfs recv $force $destfs"
else
zrep_ssh $srchost "$ZREP_PATH ${ZREP_R} _refreshpull $newsnap $token ${Z_F_OUT}" |
zrep_ssh $srchost "$ZREP_PATH ${ZREP_R} _refreshpull ${ZREP_INC_FLAG} $newsnap $token ${Z_F_OUT}" |
eval ${Z_F_IN} zfs recv $force $destfs
fi
if [[ $? -ne 0 ]] ; then
Expand Down Expand Up @@ -663,6 +663,13 @@ _refreshpull(){
typeset fs snapname lastsent latest verbose
typeset token=""

case "$1" in
-i|-I)
ZREP_INC_FLAG=$1
shift
;;
esac

if [[ "$2" != "" ]] ; then
token="$2"
fi
Expand Down