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/cache/cache.kshlib
+++ new/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
|
↓ open down ↓ |
17 lines elided |
↑ open up ↑ |
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
24 24 # Use is subject to license terms.
25 25 #
26 26
27 27 #
28 -# Copyright (c) 2013 by Delphix. All rights reserved.
28 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
29 29 #
30 30
31 31 . $STF_SUITE/include/libtest.shlib
32 32
33 33 function cleanup
34 34 {
35 35 if datasetexists $TESTPOOL ; then
36 - log_must $ZPOOL destroy -f $TESTPOOL
36 + log_must zpool destroy -f $TESTPOOL
37 37 fi
38 38 if datasetexists $TESTPOOL2 ; then
39 - log_must $ZPOOL destroy -f $TESTPOOL2
39 + log_must zpool destroy -f $TESTPOOL2
40 40 fi
41 41 }
42 42
43 43 #
44 44 # Try zpool status/iostat for given pool
45 45 #
46 46 # $1 pool
47 47 #
48 48 function display_status
49 49 {
50 50 typeset pool=$1
51 51
52 52 typeset -i ret=0
53 - $ZPOOL status -xv $pool > /dev/null 2>&1
53 + zpool status -xv $pool > /dev/null 2>&1
54 54 ret=$?
55 55
56 - $ZPOOL iostat > /dev/null 2>&1
56 + zpool iostat > /dev/null 2>&1
57 57 ((ret |= $?))
58 58
59 59 typeset mntpnt=$(get_prop mountpoint $pool)
60 - $DD if=/dev/random of=$mntpnt/testfile.$$ &
60 + dd if=/dev/random of=$mntpnt/testfile.$$ &
61 61 typeset pid=$!
62 62
63 - $ZPOOL iostat -v 1 3 > /dev/null
63 + zpool iostat -v 1 3 > /dev/null
64 64 ((ret |= $?))
65 65
66 66 kill -9 $pid
67 67
68 68 return $ret
69 69 }
70 70
71 71 #
72 72 # Verify the given cache device have correct type and status
73 73 #
74 74 # $1 pool name
75 75 # $2 device name
76 76 # $3 device status
77 77 # $4 device type
78 78 #
79 79 function verify_cache_device
80 80 {
81 81 typeset pool=$1
82 82 typeset device=$2
83 83 typeset status=$3
84 84 typeset type=$4
85 85
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
86 86 if [[ -z $pool || -z $device || -z $status ]]; then
87 87 log_fail "Usage: verify_cache_device <pool> <device> " \
88 88 "<status> [type]"
89 89 fi
90 90
91 91 #
92 92 # Get all the cache devices and status table like below
93 93 #
94 94 # mirror:/disks/d ONLINE mirror:/disks/e ONLINE stripe:/disks/f ONLINE
95 95 #
96 - set -A dev_stat_tab $($ZPOOL status -v $pool | $NAWK 'BEGIN {start=0} \
96 + set -A dev_stat_tab $(zpool status -v $pool | nawk 'BEGIN {start=0} \
97 97 /\tcache/ {start=1}
98 98 /\tmirror/ || /\tspares/ || /^$/ {start=0}
99 99 (start==1) && /\t (\/|[a-zA-Z])/ \
100 100 {print "stripe:" $1 " " $2}
101 101 (start==1) && /\t (\/|[a-zA-Z])/ \
102 102 {print "mirror:" $1 " " $2}
103 103 # When hotspare is replacing
104 104 (start==1) && /\t (\/|[a-zA-Z])/ \
105 105 {print "mirror:" $1 " " $2}'
106 106 )
107 107
108 108 typeset -i i=0
109 109 typeset find=0
110 110 while (( i < ${#dev_stat_tab[@]} )); do
111 111 typeset dev=${dev_stat_tab[$i]}
112 112 typeset stat=${dev_stat_tab[((i+1))]}
113 113
114 114 case $dev in
115 115 stripe:$device)
116 116 if [[ "$type" == 'mirror' ]]; then
117 117 log_note "Unexpected type: mirror"
118 118 return 1
119 119 else
120 120 if [[ $stat != $status ]]; then
121 121 log_note "Status($stat) " \
122 122 "!= Expected stat($status)"
123 123 return 1
124 124 fi
125 125 return 0
126 126 fi
127 127 ;;
128 128 mirror:$device)
129 129 if [[ -z "$type" || $type == 'stripe' ]]; then
130 130 log_note "Unexpected type: stripe"
131 131 return 1
132 132 else
133 133 if [[ $stat != $status ]]; then
134 134 log_note "Status($stat) " \
135 135 "!= Expected stat($status)"
136 136 return 1
137 137 fi
138 138 return 0
139 139 fi
140 140 ;;
|
↓ open down ↓ |
34 lines elided |
↑ open up ↑ |
141 141 esac
142 142 ((i += 2))
143 143 done
144 144
145 145 log_note "Can not find device: $device"
146 146 return 1
147 147 }
148 148
149 149 function verify_cache_support
150 150 {
151 - $ZPOOL upgrade -v | $GREP "Cache devices" > /dev/null 2>&1
151 + zpool upgrade -v | grep "Cache devices" > /dev/null 2>&1
152 152 return $?
153 153 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX