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/slog/slog_007_pos.ksh
          +++ new/usr/src/test/zfs-tests/tests/functional/slog/slog_007_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 2007 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/tests/functional/slog/slog.kshlib
  33   33  
  34   34  #
  35   35  # DESCRIPTION:
  36   36  #       Exporting and importing pool with log devices passes.
  37   37  #
  38   38  # STRATEGY:
  39   39  #       1. Create pool with log devices.
↓ open down ↓ 12 lines elided ↑ open up ↑
  52   52  for type in "" "mirror" "raidz" "raidz2"
  53   53  do
  54   54          for spare in "" "spare"
  55   55          do
  56   56                  for logtype in "" "mirror"
  57   57                  do
  58   58                          #
  59   59                          # Create pool which devices resider in different
  60   60                          # directory
  61   61                          #
  62      -                        log_must $ZPOOL create $TESTPOOL $type $VDEV \
       62 +                        log_must zpool create $TESTPOOL $type $VDEV \
  63   63                                  $spare $SDEV log $logtype $LDEV $LDEV2
  64   64                          ldev=$(random_get $LDEV $LDEV2)
  65   65                          log_must verify_slog_device \
  66   66                                  $TESTPOOL $ldev 'ONLINE' $logtype
  67   67  
  68   68                          #
  69   69                          # Nomal export/import operating
  70   70                          #
  71      -                        log_must $ZPOOL export $TESTPOOL
  72      -                        log_must $ZPOOL import -d $VDIR -d $VDIR2 $TESTPOOL
       71 +                        log_must zpool export $TESTPOOL
       72 +                        log_must zpool import -d $VDIR -d $VDIR2 $TESTPOOL
  73   73                          log_must display_status $TESTPOOL
  74   74                          ldev=$(random_get $LDEV $LDEV2)
  75   75                          log_must verify_slog_device \
  76   76                                  $TESTPOOL $ldev 'ONLINE' $logtype
  77   77  
  78   78                          #
  79   79                          # Destroy the pool and import again
  80   80                          #
  81      -                        log_must $ZPOOL destroy $TESTPOOL
  82      -                        log_must $ZPOOL import -Df -d $VDIR -d $VDIR2 $TESTPOOL
       81 +                        log_must zpool destroy $TESTPOOL
       82 +                        log_must zpool import -Df -d $VDIR -d $VDIR2 $TESTPOOL
  83   83                          log_must display_status $TESTPOOL
  84   84                          ldev=$(random_get $LDEV $LDEV2)
  85   85                          log_must verify_slog_device \
  86   86                                  $TESTPOOL $ldev 'ONLINE' $logtype
  87   87  
  88      -                        log_must $ZPOOL destroy -f $TESTPOOL
       88 +                        log_must zpool destroy -f $TESTPOOL
  89   89                  done
  90   90          done
  91   91  done
  92   92  
  93   93  log_pass "Exporting and importing pool with log devices passes."
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX