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_003_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_003_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  # Verify that it's possible to set a reservation on a filesystem,
  39   39  # or volume multiple times, without resetting the reservation
↓ open down ↓ 12 lines elided ↑ open up ↑
  52   52  verify_runnable "both"
  53   53  
  54   54  log_assert "Verify it is possible to set reservations multiple times " \
  55   55          "on a filesystem regular and sparse volume"
  56   56  
  57   57  function cleanup
  58   58  {
  59   59          log_must zero_reservation $TESTPOOL/$TESTFS
  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  
  69   69  #
  70   70  # Set a reservation $RESV_ITER times on a dataset and verify that
  71   71  # the reservation is correctly set each time.
  72   72  #
↓ open down ↓ 16 lines elided ↑ open up ↑
  89   89              ((resv_size = (vol_set_size - RESV_DELTA) / RESV_ITER))
  90   90  
  91   91          resv_size_set=$resv_size
  92   92  
  93   93          while (($i < $RESV_ITER)); do
  94   94  
  95   95                  ((i = i + 1))
  96   96  
  97   97                  ((resv_size_set = resv_size * i))
  98   98  
  99      -                log_must $ZFS set reservation=$resv_size_set $dataset
       99 +                log_must zfs set reservation=$resv_size_set $dataset
 100  100  
 101  101                  resv_size_get=`get_prop reservation $dataset`
 102  102                  if [[ $resv_size_set != $resv_size_get ]]; then
 103  103                          log_fail "Reservation not the expected value " \
 104  104                              "($resv_size_set != $resv_size_get)"
 105  105                  fi
 106  106          done
 107  107  
 108  108          log_must zero_reservation $dataset
 109  109  }
↓ open down ↓ 4 lines elided ↑ open up ↑
 114  114          OBJ_LIST=""
 115  115  else
 116  116          OBJ_LIST="$TESTPOOL/$TESTVOL $TESTPOOL/$TESTVOL2"
 117  117  
 118  118          ((vol_set_size = space_avail / 4))
 119  119          vol_set_size=$(floor_volsize $vol_set_size)
 120  120          ((sparse_vol_set_size = space_avail * 4))
 121  121          sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 122  122  
 123  123  
 124      -        log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
 125      -        log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
 126      -        log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
      124 +        log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
      125 +        log_must zfs set reservation=none $TESTPOOL/$TESTVOL
      126 +        log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 127  127  fi
 128  128  
 129  129  for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 130  130          multiple_resv $obj
 131  131  done
 132  132  
 133  133  log_pass "Multiple reservations successfully set on filesystem" \
 134  134      " and both volume types"
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX