exa/zfs-backup
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

workaround for Sun_SSH

Browse source 
Sun_SSH doesn't close correctly on sigpipe. Kill it manually.
This commit is contained in:
Mirek Kratochvil 2014-10-12 16:47:37 +02:00
parent 543f00bd3a
commit 3ee8104210
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
zb-pull
View file

@ -51,12 +51,21 @@ if [ "$newest" = "$newest_common" ] ; then
exit 0 exit 0
fi fi
ret=0
if [ "$newest_common" = "N/A" ] ; then if [ "$newest_common" = "N/A" ] ; then
#do a full send #do a full send
ssh $ssh_remote "zfs send -R \"${remote_zfs}@zb-${newest}\"" | zfs recv -F "${local_zfs}" ssh $ssh_remote "zfs send -R \"${remote_zfs}@zb-${newest}\"" | zfs recv -F "${local_zfs}"
exit $? ret=$?
else else
#do incremental send #do incremental send
ssh $ssh_remote "zfs send -R -I \"${remote_zfs}@zb-${newest_common}\" \"${remote_zfs}@zb-${newest}\"" | zfs recv -F "${local_zfs}" ssh $ssh_remote "zfs send -R -I \"${remote_zfs}@zb-${newest_common}\" \"${remote_zfs}@zb-${newest}\"" | zfs recv -F "${local_zfs}"
exit $? ret=$?
fi fi
#in some cases and on some setups (Sun_SSH) when `zfs recv` fails, ssh ignores
#the SIGPIPE and the connection hangs there forever, somehow. This fixes the
#issue by killing all children that were possibly spawned by this shell.
[ "$ZB_WORKAROUND_SSH_SIGPIPE" = "yes" ] && pkill -P $$
exit $ret