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_002_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_002_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 2007 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  # Reservation values cannot exceed the amount of space available
  39   39  # in the pool. Verify that attempting to set a reservation greater
↓ open down ↓ 7 lines elided ↑ open up ↑
  47   47  # 4) Verify that the reservation is still set to 'none' (or 0) on
  48   48  # the filesystem.
  49   49  # 5) Repeat 3-4 for regular and sparse volume
  50   50  #
  51   51  
  52   52  verify_runnable "both"
  53   53  
  54   54  function cleanup
  55   55  {
  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  
  63   63  log_onexit cleanup
  64   64  
  65   65  log_assert "Reservation values cannot exceed the amount of space" \
  66   66          " available in the pool"
  67   67  
↓ open down ↓ 2 lines elided ↑ open up ↑
  70   70  if ! is_global_zone ; then
  71   71          OBJ_LIST=""
  72   72  else
  73   73          OBJ_LIST="$TESTPOOL/$TESTVOL $TESTPOOL/$TESTVOL2"
  74   74  
  75   75          ((vol_set_size = space_avail / 4))
  76   76          vol_set_size=$(floor_volsize $vol_set_size)
  77   77          ((sparse_vol_set_size = space_avail * 4))
  78   78          sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
  79   79  
  80      -        log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
  81      -        log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
  82      -        log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
       80 +        log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
       81 +        log_must zfs set reservation=none $TESTPOOL/$TESTVOL
       82 +        log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
  83   83  fi
  84   84  
  85   85  for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
  86   86  
  87   87          space_avail=`get_prop available $TESTPOOL`
  88   88          resv_size_set=`expr $space_avail + $RESV_DELTA`
  89   89  
  90   90          #
  91   91          # For regular (non-sparse) volumes the upper limit is determined
  92   92          # not by the space available in the pool but rather by the size
  93   93          # of the volume itself.
  94   94          #
  95   95          [[ $obj == $TESTPOOL/$TESTVOL ]] && \
  96   96              ((resv_size_set = vol_set_size + RESV_DELTA))
  97   97  
  98   98          log_must zero_reservation $obj
  99      -        log_mustnot $ZFS set reservation=$resv_size_set $obj
       99 +        log_mustnot zfs set reservation=$resv_size_set $obj
 100  100  
 101  101          resv_size_get=`get_prop reservation $obj`
 102  102  
 103  103          if (($resv_size_get != 0)); then
 104  104                  log_fail "Reservation value non-zero ($resv_size_get)"
 105  105          fi
 106  106  done
 107  107  
 108  108  log_pass "Attempting to set too large reservation failed as expected"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX