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_012_pos.sh
          +++ new/usr/src/test/zfs-tests/tests/functional/reservation/reservation_012_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  # A reservation guarantees a certain amount of space for a dataset.
  39   39  # Nothing else which happens in the same pool should affect that

  40   40  # space, i.e. even if the rest of the pool fills up the reserved
  41   41  # space should still be accessible.
  42   42  #
  43   43  # STRATEGY:
  44   44  # 1) Create 2 filesystems
  45   45  # 2) Set a reservation on one filesystem
  46   46  # 3) Fill up the other filesystem (which does not have a reservation

  47   47  # set) until all space is consumed
  48   48  # 4) Verify can still write to the filesystem which has a reservation
  49   49  #
  50   50  
  51   51  verify_runnable "both"
  52   52  
  53   53  log_assert "Verify reservations protect space"
  54   54  
  55   55  function cleanup
  56   56  {
  57      -        log_must $ZFS destroy -f $TESTPOOL/$TESTFS2
       57 +        log_must zfs destroy -f $TESTPOOL/$TESTFS2
  58   58          log_must zero_reservation $TESTPOOL/$TESTFS
  59   59  
  60      -        [[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
  61      -        [[ -d $TESTDIR2 ]] && log_must $RM -rf $TESTDIR2
       60 +        [[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
       61 +        [[ -d $TESTDIR2 ]] && log_must rm -rf $TESTDIR2
  62   62  }
  63   63  
  64   64  log_onexit cleanup
  65   65  
  66      -log_must $ZFS create $TESTPOOL/$TESTFS2
  67      -log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS2
       66 +log_must zfs create $TESTPOOL/$TESTFS2
       67 +log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS2
  68   68  
  69   69  space_avail=`get_prop available $TESTPOOL`
  70   70  
  71   71  ((resv_size_set = space_avail - RESV_FREE_SPACE))
  72   72  
  73      -log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS
       73 +log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS
  74   74  
  75   75  ((write_count = (RESV_FREE_SPACE + RESV_TOLERANCE) / BLOCK_SIZE))
  76   76  
  77      -$FILE_WRITE -o create -f $TESTDIR2/$TESTFILE1 -b $BLOCK_SIZE -c $write_count \
       77 +file_write -o create -f $TESTDIR2/$TESTFILE1 -b $BLOCK_SIZE -c $write_count \
  78   78      -d 0
  79   79  ret=$?
  80   80  if [[ $ret != $ENOSPC ]]; then
  81   81          log_fail "Did not get ENOSPC (got $ret) for non-reserved filesystem"
  82   82  fi
  83   83  
  84   84  ((write_count = (RESV_FREE_SPACE - RESV_TOLERANCE) / BLOCK_SIZE))
  85      -log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $BLOCK_SIZE -c \
       85 +log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b $BLOCK_SIZE -c \
  86   86      $write_count -d 0
  87   87  
  88   88  log_pass "Reserved space preserved correctly"
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX