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_004_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_004_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 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/reservation/reservation.shlib
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #
  38   38  # When a dataset which has a reservation set on it is destroyed,
  39   39  # the space consumed or reserved by that dataset should be released
↓ open down ↓ 9 lines elided ↑ open up ↑
  49   49  # 6) Verify that the space used and available totals for the pool have
  50   50  # changed by the expected amounts (within tolerances).
  51   51  # 7) Repeat steps 3-6 for a regular volume and sparse volume
  52   52  #
  53   53  
  54   54  verify_runnable "both"
  55   55  
  56   56  function cleanup {
  57   57  
  58   58          for obj in $OBJ_LIST; do
  59      -                datasetexists $obj && log_must $ZFS destroy -f $obj
       59 +                datasetexists $obj && log_must zfs destroy -f $obj
  60   60          done
  61   61  }
  62   62  
  63   63  log_assert "Verify space released when a dataset with reservation is destroyed"
  64   64  
  65   65  log_onexit cleanup
  66   66  
  67      -log_must $ZFS create $TESTPOOL/$TESTFS2
       67 +log_must zfs create $TESTPOOL/$TESTFS2
  68   68  
  69   69  space_avail=`get_prop available $TESTPOOL`
  70   70  
  71   71  if ! is_global_zone ; then
  72   72          OBJ_LIST="$TESTPOOL/$TESTFS2"
  73   73  else
  74   74          OBJ_LIST="$TESTPOOL/$TESTFS2 \
  75   75                  $TESTPOOL/$TESTVOL $TESTPOOL/$TESTVOL2"
  76   76  
  77   77          ((vol_set_size = space_avail / 4))
  78   78          vol_set_size=$(floor_volsize $vol_set_size)
  79   79          ((sparse_vol_set_size = space_avail * 4))
  80   80          sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
  81   81  
  82      -        log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
  83      -        log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
  84      -        log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
  85      -        log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
       82 +        log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
       83 +        log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
       84 +        log_must zfs set reservation=none $TESTPOOL/$TESTVOL
       85 +        log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
  86   86  fi
  87   87  
  88   88  # re-calculate space available.
  89   89  space_avail=`get_prop available $TESTPOOL`
  90   90  
  91   91  # Calculate a large but valid reservation value.
  92   92  resv_size_set=`expr $space_avail - $RESV_DELTA`
  93   93  
  94   94  for obj in $OBJ_LIST ; do
  95   95  
↓ open down ↓ 1 lines elided ↑ open up ↑
  97   97          space_used=`get_prop used $TESTPOOL`
  98   98  
  99   99          #
 100  100          # For regular (non-sparse) volumes the upper limit is determined
 101  101          # not by the space available in the pool but rather by the size
 102  102          # of the volume itself.
 103  103          #
 104  104          [[ $obj == $TESTPOOL/$TESTVOL ]] && \
 105  105              ((resv_size_set = vol_set_size - RESV_DELTA))
 106  106  
 107      -        log_must $ZFS set reservation=$resv_size_set $obj
      107 +        log_must zfs set reservation=$resv_size_set $obj
 108  108  
 109  109          resv_size_get=`get_prop reservation $obj`
 110  110          if [[ $resv_size_set != $resv_size_get ]]; then
 111  111                  log_fail "Reservation not the expected value " \
 112  112                  "($resv_size_set != $resv_size_get)"
 113  113          fi
 114  114  
 115      -        log_must $ZFS destroy -f $obj
      115 +        log_must zfs destroy -f $obj
 116  116  
 117  117          new_space_avail=`get_prop available $TESTPOOL`
 118  118          new_space_used=`get_prop used $TESTPOOL`
 119  119  
 120  120          log_must within_limits $space_used $new_space_used $RESV_TOLERANCE
 121  121          log_must within_limits $space_avail $new_space_avail $RESV_TOLERANCE
 122  122  done
 123  123  
 124  124  log_pass "Space correctly released when dataset is destroyed"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX