Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 24,34 **** # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/reservation/reservation.shlib --- 24,34 ---- # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/reservation/reservation.shlib
*** 54,71 **** log_assert "Setting top level dataset reservation to 'none' allows more data " "to be written to top level filesystem" function cleanup { ! log_must $RM -rf $TESTDIR/$TESTFILE1 ! log_must $RM -rf $TESTDIR/$TESTFILE2 ! log_must $ZFS destroy -f $TESTPOOL/$TESTFS1 } log_onexit cleanup ! log_must $ZFS create $TESTPOOL/$TESTFS1 space_avail=`get_prop available $TESTPOOL` # # To make sure this test doesn't take too long to execute on --- 54,71 ---- log_assert "Setting top level dataset reservation to 'none' allows more data " "to be written to top level filesystem" function cleanup { ! log_must rm -rf $TESTDIR/$TESTFILE1 ! log_must rm -rf $TESTDIR/$TESTFILE2 ! log_must zfs destroy -f $TESTPOOL/$TESTFS1 } log_onexit cleanup ! log_must zfs create $TESTPOOL/$TESTFS1 space_avail=`get_prop available $TESTPOOL` # # To make sure this test doesn't take too long to execute on
*** 73,100 **** # applied to the dataset will ensure we have RESV_FREE_SPACE # left free in the pool which we can quickly fill. # ((resv_size_set = space_avail - RESV_FREE_SPACE)) ! log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS1 space_avail_still=`get_prop available $TESTPOOL` fill_size=`expr $space_avail_still + $RESV_TOLERANCE` write_count=`expr $fill_size / $BLOCK_SIZE` # Now fill up the filesystem (which doesn't have a reservation set # and thus will use up whatever free space is left in the pool). ! $FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \ -c $write_count -d 0 ret=$? if (($ret != $ENOSPC)); then log_fail "Did not get ENOSPC as expected (got $ret)." fi ! log_must $ZFS set reservation=none $TESTPOOL/$TESTFS1 ! log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \ -c 1000 -d 0 log_pass "Setting top level dataset reservation to 'none' allows more " \ "data to be written to the top level filesystem" --- 73,100 ---- # applied to the dataset will ensure we have RESV_FREE_SPACE # left free in the pool which we can quickly fill. # ((resv_size_set = space_avail - RESV_FREE_SPACE)) ! log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS1 space_avail_still=`get_prop available $TESTPOOL` fill_size=`expr $space_avail_still + $RESV_TOLERANCE` write_count=`expr $fill_size / $BLOCK_SIZE` # Now fill up the filesystem (which doesn't have a reservation set # and thus will use up whatever free space is left in the pool). ! file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \ -c $write_count -d 0 ret=$? if (($ret != $ENOSPC)); then log_fail "Did not get ENOSPC as expected (got $ret)." fi ! log_must zfs set reservation=none $TESTPOOL/$TESTFS1 ! log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \ -c 1000 -d 0 log_pass "Setting top level dataset reservation to 'none' allows more " \ "data to be written to the top level filesystem"