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

receive: don't fail inheriting (-x) properties on wrong dataset type

Browse Source 
Receiving datasets while blanket inheriting properties like zfs 
receive -x mountpoint can generally be desirable, e.g. to avoid 
unexpected mounts on backup hosts.

Currently this will fail to receive zvols due to the mountpoint 
property being applicable to filesystems only.  This limitation 
currently requires operators to special-case their minds and tools 
for zvols.

This change gets rid of this limitation for inherit (-x) by
Spiting up the dataset type handling: Warnings for inheriting (-x), 
errors for overriding (-o).

Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
Closes #11416
Closes #11840
Closes #11864
This commit is contained in:
Prawn
2021-04-27 02:23:51 +02:00
committed by Brian Behlendorf
parent 1b7d883eaa
commit 6c1a7be11e
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh
+10 -5
View File
@@ -259,16 +259,21 @@ log_must zfs destroy -r -f $orig
log_must zfs destroy -r -f $dest
#
# 3.7 Verify we can't receive a send stream overriding or excluding properties
# invalid for the dataset type unless the stream it's recursive, in which
# case only the appropriate properties are set on the destination.
#
# 3.7 Verify we can receive a send stream excluding but not overriding
# properties invalid for the dataset type, in which case only the
# appropriate properties are set on the destination.
log_must zfs create -V 128K -s $orig
log_must zfs snapshot $orig@snap1
log_must eval "zfs send $orig@snap1 > $streamfile_full"
log_mustnot eval "zfs receive -x atime $dest < $streamfile_full"
log_mustnot eval "zfs receive -o atime=off $dest < $streamfile_full"
log_mustnot eval "zfs receive -o atime=off -x canmount $dest < $streamfile_full"
log_must eval "zfs receive -x atime -x canmount $dest < $streamfile_full"
log_must eval "check_prop_source $dest type volume -"
log_must eval "check_prop_source $dest atime - -"
log_must eval "check_prop_source $dest canmount - -"
log_must_busy zfs destroy -r -f $orig
log_must_busy zfs destroy -r -f $dest
# Recursive sends also accept (and ignore) such overrides
log_must zfs create $orig
log_must zfs create -V 128K -s $origsub
log_must zfs snapshot -r $orig@snap1