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>

          --- old/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh

   1    1  #!/usr/bin/bash -p
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]

  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  # For a sparse volume changes to the volsize are not reflected in the
  39   39  # reservation.

  40   40  #
  41   41  # STRATEGY:
  42   42  # 1) Create a regular and sparse volume
  43   43  # 2) Get the space available in the pool
  44   44  # 3) Set reservation with various sizes on the regular and sparse volumes
  45   45  # 4) Verify that the 'reservation' property for the regular volume has
  46   46  #    the correct value.
  47   47  # 5) Verify that the 'reservation' property for the sparse volume is set to

  48   48  #    'none'
  49   49  #
  50   50  
  51   51  verify_runnable "global"
  52   52  
  53   53  function cleanup
  54   54  {
  55   55          typeset vol
  56   56  
  57   57          for vol in $regvol $sparsevol; do
  58      -                datasetexists $vol &&  log_must $ZFS destroy $vol
       58 +                datasetexists $vol &&  log_must zfs destroy $vol
  59   59          done
  60   60  }
  61   61  log_onexit cleanup
  62   62  
  63   63  log_assert "Verify that the volsize changes of sparse volumes are not " \
  64   64      "reflected in the reservation."
  65   65  log_onexit cleanup
  66   66  
  67   67  # Create a regular and sparse volume for testing.
  68   68  regvol=$TESTPOOL/$TESTVOL
  69   69  sparsevol=$TESTPOOL/$TESTVOL2
  70      -log_must $ZFS create -V 64M $regvol
  71      -log_must $ZFS create -s -V 64M $sparsevol
       70 +log_must zfs create -V 64M $regvol
       71 +log_must zfs create -s -V 64M $sparsevol
  72   72  
  73   73  typeset -i vsize=$(get_prop available $TESTPOOL)
  74   74  typeset -i iterate=10
  75   75  typeset -i regreserv
  76   76  typeset -i sparsereserv
  77   77  typeset -i volblocksize=$(get_prop volblocksize $regvol)
  78   78  typeset -i blknum=0
  79   79  typeset -i randomblknum
  80   80  ((blknum = vsize / volblocksize))
  81   81  
  82   82  while ((iterate > 1)); do
  83   83          ((randomblknum = 1 + RANDOM % blknum))
  84   84          # Make sure volsize is a multiple of volume block size
  85   85          ((vsize = randomblknum * volblocksize))
  86      -        log_must $ZFS set volsize=$vsize $regvol
  87      -        log_must $ZFS set volsize=$vsize $sparsevol
       86 +        log_must zfs set volsize=$vsize $regvol
       87 +        log_must zfs set volsize=$vsize $sparsevol
  88   88          vsize=$(volsize_to_reservation $regvol $vsize)
  89   89          regreserv=$(get_prop refreservation $regvol)
  90   90          sparsereserv=$(get_prop reservation $sparsevol)
  91   91          ((sparsereserv == vsize)) && \
  92   92                  log_fail "volsize changes of sparse volume is reflected in " \
  93   93                      "reservation (expected $vsize, got $sparsereserv)."
  94   94          ((regreserv != vsize)) && \
  95   95                  log_fail "volsize changes of regular volume is not reflected " \
  96   96                      "in reservation (expected $vsize, got $regreserv)."
  97   97          ((iterate = iterate - 1))
  98   98  done
  99   99  
 100  100  log_pass "The volsize changes of sparse volumes are not reflected in the " \
 101  101      "reservation"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX