c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized variable snapprops_nvlist in zfs_receive_one

Browse Source 
The variable snapprops_nvlist was never initialized, so properties
were not applied to the received snapshot.

Additionally, add zfs_receive_013_pos.ksh script to ZFS test suite to exercise
'zfs receive' functionality for user properties.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #4338
This commit is contained in:
LOLi 2016-10-07 19:05:06 +02:00 committed by Brian Behlendorf
parent 910a571578
commit 48f783de79
4 changed files with 91 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libzfs/libzfs_sendrecv.c
View File

@ -3110,6 +3110,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
ENOENT);
if (stream_avl != NULL) {
nvlist_t *lookup = NULL;
nvlist_t *fs = fsavl_find(stream_avl, drrb->drr_toguid,
&snapname);
@ -3125,6 +3126,10 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
VERIFY(0 == nvlist_add_uint64(props,
zfs_prop_to_name(ZFS_PROP_CANMOUNT), 0));
}
if (0 == nvlist_lookup_nvlist(fs, "snapprops", &lookup)) {
VERIFY(0 == nvlist_lookup_nvlist(lookup,
snapname, &snapprops_nvlist));
}
}
cp = NULL;

2
tests/runfiles/linux.run
View File

@ -144,7 +144,7 @@ tests = []
tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
'zfs_receive_005_neg', 'zfs_receive_006_pos',
'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg',
'zfs_receive_010_pos', 'zfs_receive_012_pos']
'zfs_receive_010_pos', 'zfs_receive_012_pos', 'zfs_receive_013_pos']
# DISABLED:
# zfs_rename_002_pos - needs investigation

3
tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile.am
View File

@ -13,4 +13,5 @@ dist_pkgdata_SCRIPTS = \
zfs_receive_009_neg.ksh \
zfs_receive_010_pos.ksh \
zfs_receive_011_pos.ksh \
zfs_receive_012_pos.ksh
zfs_receive_012_pos.ksh \
zfs_receive_013_pos.ksh

83
tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh Executable file
View File

@ -0,0 +1,83 @@
#!/bin/ksh -p
#
# CDDL HEADER START
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
# CDDL HEADER END
#
#
# Copyright 2016, loli10K. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
#
# DESCRIPTION:
# Verify ZFS can receive custom properties on both filesystems and
# snapshots from full and incremental streams.
#
# STRATEGY:
# 1. Create a filesystem.
# 2. Snapshot the filesystem.
# 3. Set custom properties on both the fs and snapshots.
# 4. Create different send streams with the properties.
# 5. Receive the send streams and verify the properties.
#
verify_runnable "both"
typeset streamfile_full=/var/tmp/streamfile_full.$$
typeset streamfile_incr=/var/tmp/streamfile_incr.$$
orig=$TESTPOOL/$TESTFS1
dest=$TESTPOOL/$TESTFS2
typeset user_prop=$(valid_user_property 8)
typeset value=$(user_property_value 8)
function cleanup
{
log_must $RM $streamfile_full
log_must $RM $streamfile_incr
log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1
log_must $ZFS destroy -rf $TESTPOOL/$TESTFS2
}
log_assert "ZFS can receive custom properties."
log_onexit cleanup
# 1. Create a filesystem.
log_must $ZFS create $orig
# 2. Snapshot the filesystem.
log_must $ZFS snapshot $orig@snap1
log_must $ZFS snapshot $orig@snap2
log_must $ZFS snapshot $orig@snap3
# 3. Set custom properties on both the fs and snapshots.
log_must eval "$ZFS set '$user_prop'='$value' $orig"
log_must eval "$ZFS set '$user_prop:snap1'='$value:snap1' $orig@snap1"
log_must eval "$ZFS set '$user_prop:snap2'='$value:snap2' $orig@snap2"
log_must eval "$ZFS set '$user_prop:snap3'='$value:snap3' $orig@snap3"
# 4. Create different send streams with the properties.
log_must eval "$ZFS send -p $orig@snap1 > $streamfile_full"
log_must eval "$ZFS send -p -I $orig@snap1 $orig@snap3 > $streamfile_incr"
# 5. Receive the send streams and verify the properties.
log_must eval "$ZFS recv $dest < $streamfile_full"
log_must eval "check_user_prop $dest $user_prop '$value'"
log_must eval "check_user_prop $dest@snap1 '$user_prop:snap1' '$value:snap1'"
log_must eval "$ZFS recv $dest < $streamfile_incr"
log_must eval "check_user_prop $dest@snap2 '$user_prop:snap2' '$value:snap2'"
log_must eval "check_user_prop $dest@snap3 '$user_prop:snap3' '$value:snap3'"
log_pass "ZFS can receive custom properties passed."