c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix intra-pool resumable 'zfs send -t <token>'

Browse Source 
Because resuming from a token requires "guid" -> "snapshot" mapping
we have to walk the whole dataset hierarchy to find the right snapshot
to send; when both source and destination exists, for an incremental
resumable stream, libzfs gets confused and picks up the wrong snapshot
to send from: this results in attempting to send

   "destination@snap1 -> source@snap2"

instead of

   "source@snap1 -> source@snap2"

which fails with a "Invalid cross-device link" error (EXDEV).

Fix this by adjusting the logic behind dataset traversal in
zfs_iter_children() to pick the right snapshot to send from.

Additionally update dry-run 'zfs send -t' to print its output to
stderr: this is consistent with other dry-run commands.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #6618
Closes #6619
Closes #6623
This commit is contained in:
LOLi
2017-10-11 00:22:05 +02:00
committed by Tony Hutter
parent 91b2f6ab1c
commit 926c6ec453
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/rsend/rsend.kshlib
+5 -5
View File
@@ -513,11 +513,13 @@ function test_fs_setup
{
typeset sendfs=$1
typeset recvfs=$2
typeset streamfs=$3
typeset sendpool=${sendfs%%/*}
typeset recvpool=${recvfs%%/*}
datasetexists $sendfs && log_must zfs destroy -r $sendpool
datasetexists $recvfs && log_must zfs destroy -r $recvpool
datasetexists $streamfs && log_must zfs destroy -r $streamfs
if $(datasetexists $sendfs || zfs create -o compress=lz4 $sendfs); then
mk_files 1000 256 0 $sendfs &
@@ -546,10 +548,7 @@ function test_fs_setup
">/$sendpool/incremental.zsend"
fi
if datasetexists $streamfs; then
log_must zfs destroy -r $streamfs
fi
log_must zfs create -o compress=lz4 $sendpool/stream
log_must zfs create -o compress=lz4 $streamfs
}
#
@@ -663,9 +662,10 @@ function resume_cleanup
{
typeset sendfs=$1
typeset streamfs=$2
typeset sendpool=${sendfs%%/*}
datasetexists $sendfs && log_must zfs destroy -r $sendfs
datasetexists $streamfs && log_must zfs destroy -r $streamfs
cleanup_pool $POOL2
rm -f /$POOL/initial.zsend /$POOL/incremental.zsend
rm -f /$sendpool/initial.zsend /$sendpool/incremental.zsend
}
tests/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh
+2 -2
View File
@@ -48,8 +48,8 @@ sendfs=$POOL/sendfs
recvfs=$POOL3/recvfs
streamfs=$POOL2/stream
for sendfs in $POOL2/sendfs $POOL2; do
test_fs_setup $sendfs $recvfs
for sendfs in $POOL2/sendfs $POOL3; do
test_fs_setup $sendfs $recvfs $streamfs
resume_test "zfs send -v $sendfs@a" $streamfs $recvfs
resume_test "zfs send -v -i @a $sendfs@b" $streamfs $recvfs
file_check $sendfs $recvfs
tests/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh
+1 -1
View File
@@ -42,7 +42,7 @@ streamfs=$POOL/stream
log_onexit resume_cleanup $sendfs $streamfs
test_fs_setup $sendfs $recvfs
test_fs_setup $sendfs $recvfs $streamfs
resume_test "zfs send -D -v $sendfs@a" $streamfs $recvfs
file_check $sendfs $recvfs
tests/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
+1 -1
View File
@@ -44,7 +44,7 @@ streamfs=$POOL/stream
log_onexit resume_cleanup $sendfs $streamfs
test_fs_setup $sendfs $recvfs
test_fs_setup $sendfs $recvfs $streamfs
resume_test "zfs send -v -e $sendfs@a" $streamfs $recvfs
resume_test "zfs send -v -e -i @a $sendfs@b" $streamfs $recvfs
file_check $sendfs $recvfs
tests/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
+1 -1
View File
@@ -52,7 +52,7 @@ streamfs=$POOL/stream
log_onexit resume_cleanup $sendfs $streamfs
test_fs_setup $sendfs $recvfs
test_fs_setup $sendfs $recvfs $streamfs
log_must zfs bookmark $sendfs@a $sendfs#bm_a
log_must zfs destroy $sendfs@a
log_must zfs receive -v $recvfs </$POOL/initial.zsend
tests/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh
+1 -1
View File
@@ -49,7 +49,7 @@ streamfs=$POOL/stream
log_onexit resume_cleanup $sendfs $streamfs
test_fs_setup $sendfs $recvfs
test_fs_setup $sendfs $recvfs $streamfs
log_must zfs unmount $sendfs
resume_test "zfs send $sendfs" $streamfs $recvfs
file_check $sendfs $recvfs
tests/zfs-tests/tests/functional/rsend/send-c_resume.ksh
+1 -1
View File
@@ -41,7 +41,7 @@ streamfs=$POOL/stream
log_assert "Verify compressed send streams can be resumed if interrupted"
log_onexit resume_cleanup $sendfs $streamfs
test_fs_setup $sendfs $recvfs
test_fs_setup $sendfs $recvfs $streamfs
resume_test "zfs send -c -v $sendfs@a" $streamfs $recvfs
resume_test "zfs send -c -v -i @a $sendfs@b" $streamfs $recvfs
file_check $sendfs $recvfs