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/inuse/inuse_007_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/inuse/inuse_007_pos.ksh

   1    1  #!/usr/bin/ksh -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/inuse/inuse.cfg
  34   34  
  35   35  #
  36   36  # DESCRIPTION:
  37   37  # dumpadm will interfere with devices and spare devices that are in use
  38   38  # by exported pool.
  39   39  #

  40   40  # STRATEGY:

  41   41  # 1. Create a regular|mirror|raidz|raidz2 pool with the given disk
  42   42  # 2. Export the pool
  43   43  # 3. Try to dumpadm against the disk, verify it succeeds as expect.
  44   44  #
  45   45  
  46   46  verify_runnable "global"
  47   47  
  48   48  function cleanup
  49   49  {
  50   50          if [[ -n $PREVDUMPDEV ]]; then
  51      -                log_must $DUMPADM -u -d $PREVDUMPDEV
       51 +                log_must dumpadm -u -d $PREVDUMPDEV
  52   52          fi
  53   53  
  54      -        poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
       54 +        poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
  55   55  
  56   56          poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
  57   57  
  58   58          #
  59   59          # Tidy up the disks we used.
  60   60          #
  61   61          cleanup_devices $vdisks $sdisks
  62   62  }
  63   63  
  64   64  function verify_assertion #slices
  65   65  {
  66   66          typeset targets=$1
  67   67  
  68   68          for t in $targets; do
  69      -                log_must $DUMPADM -u -d $t
       69 +                log_must dumpadm -u -d $t
  70   70  
  71      -                log_must $DUMPADM -u -d $PREVDUMPDEV
       71 +                log_must dumpadm -u -d $PREVDUMPDEV
  72   72          done
  73   73  
  74   74          return 0
  75   75  }
  76   76  
  77   77  log_assert "Verify dumpadm over exported pool succeed."
  78   78  
  79   79  log_onexit cleanup
  80   80  
  81   81  set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2"
  82   82  
  83   83  typeset -i i=0
  84   84  
  85      -PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
       85 +PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
  86   86  
  87   87  while (( i < ${#vdevs[*]} )); do
  88   88  
  89   89          for num in 0 1 2 3 ; do
  90   90                  eval typeset slice=\${FS_SIDE$num}
  91   91                  disk=${slice%s*}
  92   92                  slice=${slice##*s}
  93   93                  log_must set_partition $slice "" $FS_SIZE $disk
  94   94          done
  95   95  
  96   96          if [[ -n $SINGLE_DISK && -n ${vdevs[i]} ]]; then
  97   97                  (( i = i + 1 ))
  98   98                  continue
  99   99          fi
 100  100  
 101  101          create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
 102      -        log_must $ZPOOL export $TESTPOOL1
      102 +        log_must zpool export $TESTPOOL1
 103  103          verify_assertion "$disktargets"
 104      -        log_must $ZPOOL import $TESTPOOL1
      104 +        log_must zpool import $TESTPOOL1
 105  105          destroy_pool $TESTPOOL1
 106  106  
 107  107          if [[ ( $FS_DISK0 == $FS_DISK2 ) && -n ${vdevs[i]} ]]; then
 108  108                  (( i = i + 1 ))
 109  109                  continue
 110  110          fi
 111  111  
 112  112          if [[ ( $FS_DISK0 == $FS_DISK3 ) && ( ${vdevs[i]} == "raidz2" ) ]]; then
 113  113                  (( i = i + 1 ))
 114  114                  continue
 115  115          fi
 116  116  
 117  117          create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks
 118      -        log_must $ZPOOL export $TESTPOOL1
      118 +        log_must zpool export $TESTPOOL1
 119  119          verify_assertion "$disktargets"
 120      -        log_must $ZPOOL import $TESTPOOL1
      120 +        log_must zpool import $TESTPOOL1
 121  121          destroy_pool $TESTPOOL1
 122  122  
 123  123          (( i = i + 1 ))
 124  124  done
 125  125  
 126  126  log_pass "Dumpadm over exported pool succeed."
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX