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_006_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_006_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  # Reservations (if successfully set) guarantee a minimum amount of space
  39   39  # for a dataset. Unlike quotas however there should be no restrictions

  40   40  # on accessing space outside of the limits of the reservation (if the
  41   41  # space is available in the pool). Verify that in a filesystem with a
  42   42  # reservation set that its possible to create files both within the
  43   43  # reserved space and also outside.
  44   44  #
  45   45  # STRATEGY:
  46   46  # 1) Create a filesystem
  47   47  # 2) Get the space used and available in the pool
  48   48  # 3) Set a reservation on the filesystem

  49   49  # 4) Verify can write a file that is bigger than the reserved space
  50   50  #
  51   51  # i.e. we start writing within the reserved region and then continue
  52   52  # for 20MB outside it.
  53   53  #
  54   54  
  55   55  verify_runnable "both"
  56   56  
  57   57  function cleanup
  58   58  {
  59      -        [[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
  60      -        log_must $ZFS set reservation=none $TESTPOOL/$TESTFS
       59 +        [[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
       60 +        log_must zfs set reservation=none $TESTPOOL/$TESTFS
  61   61  }
  62   62  
  63   63  log_onexit cleanup
  64   64  
  65   65  log_assert "Verify can create files both inside and outside reserved areas"
  66   66  
  67   67  space_used=`get_prop used $TESTPOOL`
  68   68  
  69      -log_must $ZFS set reservation=$RESV_SIZE $TESTPOOL/$TESTFS
       69 +log_must zfs set reservation=$RESV_SIZE $TESTPOOL/$TESTFS
  70   70  
  71   71  #
  72   72  # Calculate how many writes of BLOCK_SIZE it would take to fill
  73   73  # up RESV_SIZE + 20971520 (20 MB).
  74   74  #
  75   75  fill_size=`expr $RESV_SIZE + 20971520`
  76   76  write_count=`expr $fill_size / $BLOCK_SIZE`
  77   77  
  78      -log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
       78 +log_must file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
  79   79      -c $write_count -d 0
  80   80  
  81   81  log_pass "Able to create files inside and outside reserved area"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX