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_005_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_005_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  # When a reservation property of a filesystem, regular volume
  39   39  # or sparse volume is set to 'none' the space previously consumed by the
↓ open down ↓ 12 lines elided ↑ open up ↑
  52   52  #
  53   53  
  54   54  verify_runnable "both"
  55   55  
  56   56  log_assert "Verify space released when reservation on a dataset is set "\
  57   57          "to 'none'"
  58   58  
  59   59  function cleanup
  60   60  {
  61   61          for obj in $OBJ_LIST; do
  62      -                datasetexists $obj && log_must $ZFS destroy -f $obj
       62 +                datasetexists $obj && log_must zfs destroy -f $obj
  63   63          done
  64   64  }
  65   65  
  66   66  log_onexit cleanup
  67   67  
  68   68  space_avail=`get_prop available $TESTPOOL`
  69   69  
  70   70  if ! is_global_zone ; then
  71   71          OBJ_LIST=""
  72   72  else
  73   73          OBJ_LIST="$TESTPOOL/$TESTVOL $TESTPOOL/$TESTVOL2"
  74   74          ((vol_set_size = space_avail / 4))
  75   75          vol_set_size=$(floor_volsize $vol_set_size)
  76   76          ((sparse_vol_set_size = space_avail * 4))
  77   77          sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
  78   78  
  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  space_avail=`get_prop available $TESTPOOL`
  86   86  space_used=`get_prop used $TESTPOOL`
  87   87  
  88   88  # Calculate a large but valid reservation value.
  89   89  resv_size_set=`expr $space_avail - $RESV_DELTA`
  90   90  
  91   91  for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
  92   92  
  93   93          #
  94   94          # For regular (non-sparse) volumes the upper limit is determined
  95   95          # not by the space available in the pool but rather by the size
  96   96          # of the volume itself.
  97   97          #
  98   98          [[ $obj == $TESTPOOL/$TESTVOL ]] && \
  99   99              ((resv_size_set = vol_set_size - RESV_DELTA))
 100  100  
 101      -        log_must $ZFS set reservation=$resv_size_set $obj
      101 +        log_must zfs set reservation=$resv_size_set $obj
 102  102  
 103  103          resv_size_get=`get_prop reservation $obj`
 104  104          if [[ $resv_size_set != $resv_size_get ]]; then
 105  105                  log_fail "Reservation not the expected value "\
 106  106                          "($resv_size_set != $resv_size_get)"
 107  107          fi
 108  108  
 109      -        log_must $ZFS set reservation=none $obj
      109 +        log_must zfs set reservation=none $obj
 110  110  
 111  111          new_space_avail=`get_prop available $TESTPOOL`
 112  112          new_space_used=`get_prop used $TESTPOOL`
 113  113  
 114  114          log_must within_limits $space_used $new_space_used $RESV_TOLERANCE
 115  115          log_must within_limits $space_avail $new_space_avail $RESV_TOLERANCE
 116  116  done
 117  117  
 118  118  log_pass "Space correctly released when dataset reservation set to 'none'"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX