Skip to content

correcting lastsnapsent when resuming broken sending #163

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
bassilov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

correcting lastsnapsent when resuming broken sending #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61b5570
Update zrep_sync
bassilov Oct 19, 2020
95ff08c
Update zrep_snap
bassilov Oct 19, 2020
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
6 changes: 4 additions & 2 deletions zrep_snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ getlastsnapsent(){
# arg. more efficient if we can just return value directly,
# but i'm using backwards compat :(
typeset lastsent
lastsent=`zfs get -H -o name -r -s local ${ZREPTAG}:sent $1 |
sort | tail -1`
# BASSILOV 2020-10-18 sorting by name is not good way because the last sent snap can be not from zrep (when resuming sendings for example)
## lastsent=`zfs get -H -o name -r -s local ${ZREPTAG}:sent $1 |
## sort | tail -1`
lastsent=`zfs get -H -o value,name -r -s local ${ZREPTAG}:sent $1 | sort -n | tail -1 | awk '{print $2;}'`
if [[ "$lastsent" != "" ]] ; then
print $lastsent
return
Expand Down
7 changes: 7 additions & 0 deletions zrep_sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,13 @@ _sync(){
"$desthost:zfs recv $recv_s $force $destfs"
else
if [[ "$token" != "" ]] ; then
# BASSILOV 2020-10-18 when resuming broken sending the last succesful snap will be different than the defined previously
# so we must find the correct one to set zrep:sent property on success. getlastsnapsent should also be fixed to find sync snaps not matching zrep_###### mask
# TO DO this option will not work correctly when used with ZREP_R=-R because it resumes only part of recursive send
# on my system I made additional property zrep:canresume and a script which analizes it and launch zrep with -s parameter when set
newsnap=`zfs send ${ZREP_RESUME_FLAGS} -n -v -t $token | grep 'toname = ' | awk 'BEGIN{ FS=" = "; }{ print $2; }'`
snapname=${newsnap#*@}

eval zfs send ${ZREP_RESUME_FLAGS} -t $token ${Z_F_OUT} |
zrep_ssh $desthost "${Z_F_IN} zfs recv $recv_s $force $destfs"
else
Expand Down