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.kshlib
+++ new/usr/src/test/zfs-tests/tests/functional/slog/slog.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 2008 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 . $STF_SUITE/tests/functional/slog/slog.cfg
33 33
34 34 function cleanup
35 35 {
36 36 if datasetexists $TESTPOOL ; then
37 - log_must $ZPOOL destroy -f $TESTPOOL
37 + log_must zpool destroy -f $TESTPOOL
38 38 fi
39 39 if datasetexists $TESTPOOL2 ; then
40 - log_must $ZPOOL destroy -f $TESTPOOL2
40 + log_must zpool destroy -f $TESTPOOL2
41 41 fi
42 42 }
43 43
44 44 #
45 45 # Try zpool status/iostat for given pool
46 46 #
47 47 # $1 pool
48 48 #
49 49 function display_status
50 50 {
51 51 typeset pool=$1
52 52
53 53 typeset -i ret=0
54 - $ZPOOL status -xv $pool > /dev/null 2>&1
54 + zpool status -xv $pool > /dev/null 2>&1
55 55 ret=$?
56 56
57 - $ZPOOL iostat > /dev/null 2>&1
57 + zpool iostat > /dev/null 2>&1
58 58 ((ret |= $?))
59 59
60 60 typeset mntpnt=$(get_prop mountpoint $pool)
61 - $DD if=/dev/random of=$mntpnt/testfile.$$ &
61 + dd if=/dev/random of=$mntpnt/testfile.$$ &
62 62 typeset pid=$!
63 63
64 - $ZPOOL iostat -v 1 3 > /dev/null
64 + zpool iostat -v 1 3 > /dev/null
65 65 ((ret |= $?))
66 66
67 67 kill -9 $pid
68 68
69 69 return $ret
70 70 }
71 71
72 72 #
73 73 # Verify the give slog device have correct type and status
74 74 #
75 75 # $1 pool name
76 76 # $2 device name
77 77 # $3 device status
78 78 # $4 device type
79 79 #
80 80 function verify_slog_device
81 81 {
82 82 typeset pool=$1
83 83 typeset device=$2
84 84 typeset status=$3
85 85 typeset type=$4
86 86
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
87 87 if [[ -z $pool || -z $device || -z $status ]]; then
88 88 log_fail "Usage: verify_slog_device <pool> <device> " \
89 89 "<status> [type]"
90 90 fi
91 91
92 92 #
93 93 # Get all the slog devices and status table like below
94 94 #
95 95 # mirror:/disks/d ONLINE mirror:/disks/e ONLINE stripe:/disks/f ONLINE
96 96 #
97 - set -A dev_stat_tab $($ZPOOL status -v $pool | $NAWK 'BEGIN {start=0} \
97 + set -A dev_stat_tab $(zpool status -v $pool | nawk 'BEGIN {start=0} \
98 98 /\tlogs/ {start=1}
99 99 /\tmirror/ || /\tspares/ || /^$/ {start=0}
100 100 (start==1) && /\t (\/|[a-zA-Z])/ \
101 101 {print "stripe:" $1 " " $2}
102 102 (start==1) && /\t (\/|[a-zA-Z])/ \
103 103 {print "mirror:" $1 " " $2}
104 104 # When hotspare is replacing
105 105 (start==1) && /\t (\/|[a-zA-Z])/ \
106 106 {print "mirror:" $1 " " $2}'
107 107 )
108 108
109 109 typeset -i i=0
110 110 typeset find=0
111 111 while (( i < ${#dev_stat_tab[@]} )); do
112 112 typeset dev=${dev_stat_tab[$i]}
113 113 typeset stat=${dev_stat_tab[((i+1))]}
114 114
115 115 case $dev in
116 116 stripe:$device)
117 117 if [[ "$type" == 'mirror' ]]; then
118 118 log_note "Unexpected type: mirror"
119 119 return 1
120 120 else
121 121 if [[ $stat != $status ]]; then
122 122 log_note "Status($stat) " \
123 123 "!= Expected stat($status)"
124 124 return 1
125 125 fi
126 126 return 0
127 127 fi
128 128 ;;
129 129 mirror:$device)
130 130 if [[ -z "$type" || $type == 'stripe' ]]; then
131 131 log_note "Unexpected type: stripe"
132 132 return 1
133 133 else
134 134 if [[ $stat != $status ]]; then
135 135 log_note "Status($stat) " \
136 136 "!= Expected stat($status)"
137 137 return 1
138 138 fi
139 139 return 0
140 140 fi
141 141 ;;
142 142 esac
143 143
144 144 ((i += 2))
145 145 done
146 146
147 147 log_note "Can not find device: $device"
148 148
149 149 return 1
150 150 }
|
↓ open down ↓ |
43 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX