diff options
Diffstat (limited to 'usr/src/test')
5 files changed, 92 insertions, 4 deletions
diff --git a/usr/src/test/zfs-tests/runfiles/delphix.run b/usr/src/test/zfs-tests/runfiles/delphix.run index 091fb22954..8722a9f430 100644 --- a/usr/src/test/zfs-tests/runfiles/delphix.run +++ b/usr/src/test/zfs-tests/runfiles/delphix.run @@ -11,6 +11,7 @@ # # Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # [DEFAULT] @@ -149,7 +150,7 @@ tests = ['zfs_written_property_001_pos'] 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_011_pos'] + 'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos'] [/opt/zfs-tests/tests/functional/cli_root/zfs_rename] tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos', diff --git a/usr/src/test/zfs-tests/runfiles/omnios.run b/usr/src/test/zfs-tests/runfiles/omnios.run index 4db1db32a5..4b394a1df6 100644 --- a/usr/src/test/zfs-tests/runfiles/omnios.run +++ b/usr/src/test/zfs-tests/runfiles/omnios.run @@ -11,6 +11,7 @@ # # Copyright (c) 2013, 2015 by Delphix. All rights reserved. +# Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # [DEFAULT] @@ -149,7 +150,7 @@ tests = ['zfs_written_property_001_pos'] 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_011_pos'] + 'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos'] [/opt/zfs-tests/tests/functional/cli_root/zfs_rename] tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos', diff --git a/usr/src/test/zfs-tests/runfiles/openindiana.run b/usr/src/test/zfs-tests/runfiles/openindiana.run index 091fb22954..8722a9f430 100644 --- a/usr/src/test/zfs-tests/runfiles/openindiana.run +++ b/usr/src/test/zfs-tests/runfiles/openindiana.run @@ -11,6 +11,7 @@ # # Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # [DEFAULT] @@ -149,7 +150,7 @@ tests = ['zfs_written_property_001_pos'] 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_011_pos'] + 'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos'] [/opt/zfs-tests/tests/functional/cli_root/zfs_rename] tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos', diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile index 687371b0a2..e5e0e8cfd4 100644 --- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile @@ -11,6 +11,7 @@ # # Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved. # include $(SRC)/Makefile.master @@ -30,7 +31,8 @@ PROGS = cleanup \ zfs_receive_008_pos \ zfs_receive_009_neg \ zfs_receive_010_pos \ - zfs_receive_011_pos + zfs_receive_011_pos \ + zfs_receive_012_pos CMDS = $(PROGS:%=$(TESTDIR)/%) $(CMDS) := FILEMODE = 0555 diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh new file mode 100644 index 0000000000..af9f91e61c --- /dev/null +++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh @@ -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, OmniTI Computer Consulting, Inc. All rights reserved. +# + +. $STF_SUITE/include/libtest.shlib + +# +# DESCRIPTION: +# refquota, like regular quota, is loosely enforced. A dataset +# can exceed its refquota by one transaction. This loose enforcement +# used to cause problems upon receiving a datastream where its +# refquota is slightly exceeded. This test confirms that we can +# successfully receive a slightly over refquota stream. +# +# STRATEGY: +# 1. Create a filesystem. +# 2. Set a refquota. +# 3. Snapshot the filesystem. +# 4. Send a replication stream to a new filesystem. +# 5. On the original filesystem, fill it up to its quota. +# 6. Snapshot the original filesystem again. +# 7. Send an incremental stream to the same new filesystem. +# + +verify_runnable "both" + +typeset streamfile=/var/tmp/streamfile.$$ + +function cleanup +{ + log_must $RM $streamfile + log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1 + log_must $ZFS destroy -rf $TESTPOOL/$TESTFS2 +} + +log_assert "The allowable slight refquota overage is properly sent-and-" \ + "received." +log_onexit cleanup + +orig=$TESTPOOL/$TESTFS1 +dest=$TESTPOOL/$TESTFS2 + +# 1. Create a filesystem. +log_must $ZFS create $orig +origdir=$(get_prop mountpoint $orig) + +# 2. Set a refquota. +log_must $ZFS set refquota=50M $orig + +# 3. Snapshot the filesystem. +log_must $ZFS snapshot $orig@1 + +# 4. Send a replication stream to a new filesystem. +log_must eval "$ZFS send -R $orig@1 > $streamfile" +log_must eval "$ZFS recv $dest < $streamfile" + +# 5. On the original filesystem, fill it up to its quota. +cat < /dev/urandom > $origdir/fill-it-up + +# 6. Snapshot the original filesystem again. +log_must $ZFS snapshot $orig@2 + +# 7. Send an incremental stream to the same new filesystem. +log_must eval "$ZFS send -I 1 -R $orig@2 > $streamfile" +log_must eval "$ZFS recv $dest < $streamfile" + +log_pass "Verified receiving a slightly-over-refquota stream succeeds." |