mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Mismatched nvlist names in zfs_keys_send_space
This causes "zfs send -vt ..." to fail with:
cannot resume send: Unknown error 1030
It turns out that some of the name/value pairs in the verification
list for zfs_ioc_send_space(), zfs_keys_send_space, had the wrong
name, so the ioctl got kicked out in zfs_check_input_nvpairs().
Update the names accordingly.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: John Poduska <jpoduska@datto.com>
Closes #10978
This commit is contained in:
@@ -635,12 +635,14 @@ function file_check
|
||||
# $1 The ZFS send command
|
||||
# $2 The filesystem where the streams are sent
|
||||
# $3 The receive filesystem
|
||||
# $4 Test dry-run (optional)
|
||||
#
|
||||
function resume_test
|
||||
{
|
||||
sendcmd=$1
|
||||
streamfs=$2
|
||||
recvfs=$3
|
||||
typeset sendcmd=$1
|
||||
typeset streamfs=$2
|
||||
typeset recvfs=$3
|
||||
typeset dryrun=${4:-1}
|
||||
|
||||
stream_num=1
|
||||
log_must eval "$sendcmd >/$streamfs/$stream_num"
|
||||
@@ -651,6 +653,11 @@ function resume_test
|
||||
stream_num=$((stream_num+1))
|
||||
|
||||
token=$(zfs get -Hp -o value receive_resume_token $recvfs)
|
||||
|
||||
# Do a dry-run
|
||||
[ $dryrun -ne 0 ] && \
|
||||
log_must eval "zfs send -nvt $token > /dev/null"
|
||||
|
||||
log_must eval "zfs send -t $token >/$streamfs/$stream_num"
|
||||
[[ -f /$streamfs/$stream_num ]] || \
|
||||
log_fail "NO FILE /$streamfs/$stream_num"
|
||||
|
||||
@@ -46,7 +46,7 @@ log_onexit resume_cleanup $sendfs $streamfs
|
||||
|
||||
test_fs_setup $sendfs $recvfs $streamfs
|
||||
log_must zfs unmount -f $sendfs
|
||||
resume_test "zfs send $sendfs" $streamfs $recvfs
|
||||
resume_test "zfs send $sendfs" $streamfs $recvfs 0
|
||||
file_check $sendfs $recvfs
|
||||
|
||||
log_pass "Verify resumability of a full ZFS send/receive with the source " \
|
||||
|
||||
Reference in New Issue
Block a user