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/refreserv/refreserv_004_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_004_pos.ksh
↓ 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/refreserv/refreserv.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  #       Verify refreservation is limited by available space.
  38   38  #
  39   39  # STRATEGY:
  40   40  #       1. Setting quota and refreservation on parent filesystem.
  41   41  #       2. Get available space on sub-filesystem.
  42   42  #       3. Verify refreservation is limited by available on it.
  43   43  #
  44   44  
  45   45  verify_runnable "both"
  46   46  
  47   47  function cleanup
  48   48  {
  49   49          if is_global_zone ; then
  50      -                log_must $ZFS set refreservation=none $TESTPOOL
       50 +                log_must zfs set refreservation=none $TESTPOOL
  51   51          fi
  52      -        log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
  53      -        log_must $ZFS create $TESTPOOL/$TESTFS
  54      -        log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
       52 +        log_must zfs destroy -rf $TESTPOOL/$TESTFS
       53 +        log_must zfs create $TESTPOOL/$TESTFS
       54 +        log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
  55   55  }
  56   56  
  57   57  log_assert "Verify refreservation is limited by available space."
  58   58  log_onexit cleanup
  59   59  
  60   60  pool=$TESTPOOL ; fs=$pool/$TESTFS ; subfs=$fs/subfs
  61      -log_must $ZFS create $subfs
       61 +log_must zfs create $subfs
  62   62  
  63   63  typeset datasets
  64   64  if is_global_zone; then
  65   65          datasets="$pool $fs"
  66   66  else
  67   67          datasets="$fs"
  68   68  fi
  69   69  
  70   70  for ds in $datasets; do
  71      -        log_must $ZFS set quota=25M $ds
  72      -        log_must $ZFS set refreservation=15M $ds
       71 +        log_must zfs set quota=25M $ds
       72 +        log_must zfs set refreservation=15M $ds
  73   73  
  74   74          typeset -i avail
  75   75          avail=$(get_prop avail $subfs)
  76      -        log_must $ZFS set refreservation=$avail $subfs
       76 +        log_must zfs set refreservation=$avail $subfs
  77   77          typeset mntpnt
  78   78          mntpnt=$(get_prop mountpoint $subfs)
  79      -        log_must $MKFILE $avail $mntpnt/$TESTFILE
       79 +        log_must mkfile $avail $mntpnt/$TESTFILE
  80   80  
  81   81          typeset -i exceed
  82   82          ((exceed = avail + 1))
  83      -        log_mustnot $ZFS set refreservation=$exceed $subfs
  84      -        log_mustnot $MKFILE $avail $mntpnt/$TESTFILE
       83 +        log_mustnot zfs set refreservation=$exceed $subfs
       84 +        log_mustnot mkfile $avail $mntpnt/$TESTFILE
  85   85  
  86      -        log_must $ZFS set quota=none $ds
  87      -        log_must $ZFS set reservation=15M $ds
       86 +        log_must zfs set quota=none $ds
       87 +        log_must zfs set reservation=15M $ds
  88   88  done
  89   89  
  90   90  log_pass "Verify refreservation is limited by available space."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX