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>

Split Close
Expand all
Collapse all
          --- old/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29      -# Copyright (c) 2013 by Delphix. All rights reserved.
       29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  30   30  #
  31   31  
  32   32  . $STF_SUITE/include/libtest.shlib
  33   33  . $STF_SUITE/tests/functional/refreserv/refreserv.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Reservations are enforced using the maximum of 'reserv' and 'refreserv'
  38   38  #
  39   39  # STRATEGY:
  40   40  #       1. Setting quota for parent filesystem.
  41   41  #       2. Setting reservation and refreservation for sub-filesystem.
  42   42  #       3. Verify the sub-fs reservation are enforced by the maximum of 'reserv'
  43   43  #          and 'refreserv'.
  44   44  #
  45   45  
  46   46  verify_runnable "both"
  47   47  
  48   48  function cleanup
  49   49  {
  50      -        log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
  51      -        log_must $ZFS create $TESTPOOL/$TESTFS
  52      -        log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
       50 +        log_must zfs destroy -rf $TESTPOOL/$TESTFS
       51 +        log_must zfs create $TESTPOOL/$TESTFS
       52 +        log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
  53   53  }
  54   54  
  55   55  log_assert "Reservations are enforced using the maximum of " \
  56   56          "'reserv' and 'refreserv'"
  57   57  log_onexit cleanup
  58   58  
  59   59  fs=$TESTPOOL/$TESTFS ; subfs=$fs/subfs
  60      -log_must $ZFS create $subfs
  61      -log_must $ZFS set quota=25M $fs
       60 +log_must zfs create $subfs
       61 +log_must zfs set quota=25M $fs
  62   62  
  63      -log_must $ZFS set reserv=10M $subfs
  64      -log_must $ZFS set refreserv=20M $subfs
       63 +log_must zfs set reserv=10M $subfs
       64 +log_must zfs set refreserv=20M $subfs
  65   65  mntpnt=$(get_prop mountpoint $fs)
  66      -log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
       66 +log_mustnot mkfile 15M $mntpnt/$TESTFILE
  67   67  
  68      -log_must $RM -f $mntpnt/$TESTFILE
       68 +log_must rm -f $mntpnt/$TESTFILE
  69   69  
  70      -log_must $ZFS set reserv=20M $subfs
  71      -log_must $ZFS set refreserv=10M $subfs
  72      -log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
       70 +log_must zfs set reserv=20M $subfs
       71 +log_must zfs set refreserv=10M $subfs
       72 +log_mustnot mkfile 15M $mntpnt/$TESTFILE
  73   73  
  74   74  log_pass "Reservations are enforced using the maximum of " \
  75   75          "'reserv' and 'refreserv'"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX