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/reservation/reservation_014_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_014_pos.sh
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  
  23   23  #
  24   24  # Copyright 2009 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/reservation/reservation.shlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #
  38   38  # A reservation cannot exceed the quota on a dataset
  39   39  #
↓ open down ↓ 7 lines elided ↑ open up ↑
  47   47  
  48   48  verify_runnable "both"
  49   49  
  50   50  log_assert "Verify cannot set reservation larger than quota"
  51   51  
  52   52  function cleanup
  53   53  {
  54   54          #
  55   55          # Note we don't destroy $TESTFS as it's used by other tests
  56   56          for obj in $OBJ_LIST ; do
  57      -                datasetexists $obj && log_must $ZFS destroy -f $obj
       57 +                datasetexists $obj && log_must zfs destroy -f $obj
  58   58          done
  59   59  
  60   60          log_must zero_reservation $TESTPOOL/$TESTFS
  61   61  }
  62   62  log_onexit cleanup
  63   63  
  64   64  space_avail=`get_prop available $TESTPOOL`
  65   65  
  66   66  if ! is_global_zone ; then
  67   67          OBJ_LIST=""
  68   68  else
  69   69          OBJ_LIST="$TESTPOOL/$TESTVOL $TESTPOOL/$TESTVOL2"
  70   70  
  71   71          ((vol_set_size = space_avail / 4))
  72   72          vol_set_size=$(floor_volsize $vol_set_size)
  73   73          ((sparse_vol_set_size = space_avail * 4))
  74   74          sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
  75   75  
  76      -        log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
  77      -        log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
       76 +        log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
       77 +        log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
  78   78  fi
  79   79  
  80   80  for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
  81   81  
  82   82          space_avail=`get_prop available $TESTPOOL`
  83   83          ((quota_set_size = space_avail / 3))
  84   84  
  85   85          #
  86   86          # A regular (non-sparse) volume's size is effectively
  87   87          # its quota so only need to explicitly set quotas for
  88   88          # filesystems and datasets.
  89   89          #
  90   90          # A volumes size is effectively its quota. The maximum
  91   91          # reservation value that can be set on a volume is
  92   92          # determined by the size of the volume or the amount of
  93   93          # space in the pool, whichever is smaller.
  94   94          #
  95   95          if [[ $obj == $TESTPOOL/$TESTFS ]]; then
  96      -                log_must $ZFS set quota=$quota_set_size $obj
       96 +                log_must zfs set quota=$quota_set_size $obj
  97   97                  ((resv_set_size = quota_set_size + RESV_SIZE))
  98   98  
  99   99          elif [[ $obj == $TESTPOOL/$TESTVOL2 ]] ; then
 100  100  
 101  101                  ((resv_set_size = sparse_vol_set_size + RESV_SIZE))
 102  102  
 103  103          elif [[ $obj == $TESTPOOL/$TESTVOL ]] ; then
 104  104  
 105  105                  ((resv_set_size = vol_set_size + RESV_SIZE))
 106  106          fi
 107  107  
 108  108          orig_quota=`get_prop quota $obj`
 109  109  
 110      -        log_mustnot $ZFS set reservation=$resv_set_size $obj
      110 +        log_mustnot zfs set reservation=$resv_set_size $obj
 111  111          new_quota=`get_prop quota $obj`
 112  112  
 113  113          if [[ $orig_quota != $new_quota ]]; then
 114  114                  log_fail "Quota value changed from $orig_quota " \
 115  115                                  "to $new_quota"
 116  116          fi
 117  117  
 118  118          if [[ $obj == $TESTPOOL/$TESTFS ]]; then
 119      -                log_must $ZFS set quota=none $obj
      119 +                log_must zfs set quota=none $obj
 120  120          fi
 121  121  done
 122  122  
 123  123  log_pass "As expected cannot set reservation larger than quota"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX