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/replacement/replacement_002_pos.ksh
+++ new/usr/src/test/zfs-tests/tests/functional/replacement/replacement_002_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]
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
19 19 #
20 20 # CDDL HEADER END
21 21 #
22 22
23 23 #
24 24 # Copyright 2008 Sun Microsystems, Inc. All rights reserved.
25 25 # Use is subject to license terms.
26 26 #
27 27
28 28 #
29 -# Copyright (c) 2013, 2015 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/replacement/replacement.cfg
34 34
35 35 #
36 36 # DESCRIPTION:
37 37 # Attaching disks during I/O should pass for supported pools.
38 38 #
39 39 # STRATEGY:
40 40 # 1. Create multidisk pools (stripe/mirror/raidz) and
41 41 # start some random I/O
42 42 # 2. Attach a disk to the pool.
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
43 43 # 3. Verify the integrity of the file system and the resilvering.
44 44 #
45 45
46 46 verify_runnable "global"
47 47
48 48 function cleanup
49 49 {
50 50 if [[ -n "$child_pids" ]]; then
51 51 for wait_pid in $child_pids
52 52 do
53 - $KILL $wait_pid
53 + kill $wait_pid
54 54 done
55 55 fi
56 56
57 57 if poolexists $TESTPOOL1; then
58 58 destroy_pool $TESTPOOL1
59 59 fi
60 60
61 - [[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
61 + [[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
62 62 }
63 63
64 64 log_assert "Replacing a disk during I/O completes."
65 65
66 66 options=""
67 67 options_display="default options"
68 68
69 69 log_onexit cleanup
70 70
71 71 [[ -n "$HOLES_FILESIZE" ]] && options=" $options -f $HOLES_FILESIZE "
72 72
73 73 [[ -n "$HOLES_BLKSIZE" ]] && options="$options -b $HOLES_BLKSIZE "
74 74
75 75 [[ -n "$HOLES_COUNT" ]] && options="$options -c $HOLES_COUNT "
76 76
77 77 [[ -n "$HOLES_SEED" ]] && options="$options -s $HOLES_SEED "
78 78
79 79 [[ -n "$HOLES_FILEOFFSET" ]] && options="$options -o $HOLES_FILEOFFSET "
80 80
81 81 options="$options -r "
82 82
83 83 [[ -n "$options" ]] && options_display=$options
84 84
85 85 child_pids=""
86 86
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
87 87 function attach_test
88 88 {
89 89 typeset -i iters=2
90 90 typeset -i index=0
91 91 typeset opt=$1
92 92 typeset disk1=$2
93 93 typeset disk2=$3
94 94
95 95 typeset i=0
96 96 while [[ $i -lt $iters ]]; do
97 - log_note "Invoking $FILE_TRUNC with: $options_display"
98 - $FILE_TRUNC $options $TESTDIR/$TESTFILE.$i &
97 + log_note "Invoking file_trunc with: $options_display"
98 + file_trunc $options $TESTDIR/$TESTFILE.$i &
99 99 typeset pid=$!
100 100
101 - $SLEEP 1
102 - if ! $PS -p $pid > /dev/null 2>&1; then
103 - log_fail "$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i"
101 + sleep 1
102 + if ! ps -p $pid > /dev/null 2>&1; then
103 + log_fail "file_trunc $options $TESTDIR/$TESTFILE.$i"
104 104 fi
105 105
106 106 child_pids="$child_pids $pid"
107 107 ((i = i + 1))
108 108 done
109 109
110 - log_must $ZPOOL attach $opt $TESTPOOL1 $disk1 $disk2
110 + log_must zpool attach $opt $TESTPOOL1 $disk1 $disk2
111 111
112 - $SLEEP 10
112 + sleep 10
113 113
114 114 for wait_pid in $child_pids
115 115 do
116 - $KILL $wait_pid
116 + kill $wait_pid
117 117 done
118 118 child_pids=""
119 119
120 - log_must $ZPOOL export $TESTPOOL1
121 - log_must $ZPOOL import -d $TESTDIR $TESTPOOL1
122 - log_must $ZFS umount $TESTPOOL1/$TESTFS1
123 - log_must $ZDB -cdui $TESTPOOL1/$TESTFS1
124 - log_must $ZFS mount $TESTPOOL1/$TESTFS1
120 + log_must zpool export $TESTPOOL1
121 + log_must zpool import -d $TESTDIR $TESTPOOL1
122 + log_must zfs umount $TESTPOOL1/$TESTFS1
123 + log_must zdb -cdui $TESTPOOL1/$TESTFS1
124 + log_must zfs mount $TESTPOOL1/$TESTFS1
125 125
126 126 }
127 127
128 128 specials_list=""
129 129 i=0
130 130 while [[ $i != 2 ]]; do
131 - $MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
131 + mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
132 132 specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
133 133
134 134 ((i = i + 1))
135 135 done
136 136
137 137 #
138 138 # Create a replacement disk special file.
139 139 #
140 -$MKFILE $MINVDEVSIZE $TESTDIR/$REPLACEFILE
140 +mkfile $MINVDEVSIZE $TESTDIR/$REPLACEFILE
141 141
142 142 for op in "" "-f"; do
143 143 create_pool $TESTPOOL1 mirror $specials_list
144 - log_must $ZFS create $TESTPOOL1/$TESTFS1
145 - log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
144 + log_must zfs create $TESTPOOL1/$TESTFS1
145 + log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
146 146
147 147 attach_test "$opt" $TESTDIR/$TESTFILE1.1 $TESTDIR/$REPLACEFILE
148 148
149 - $ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
149 + zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
150 150 if [[ $? -ne 0 ]]; then
151 151 log_fail "$REPLACEFILE is not present."
152 152 fi
153 153
154 154 destroy_pool $TESTPOOL1
155 155 done
156 156
157 157 log_note "Verify 'zpool attach' fails with non-mirrors."
158 158
159 159 for type in "" "raidz" "raidz1"; do
160 160 for op in "" "-f"; do
161 161 create_pool $TESTPOOL1 $type $specials_list
162 - log_must $ZFS create $TESTPOOL1/$TESTFS1
163 - log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
162 + log_must zfs create $TESTPOOL1/$TESTFS1
163 + log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
164 164
165 - log_mustnot $ZPOOL attach "$opt" $TESTDIR/$TESTFILE1.1 \
165 + log_mustnot zpool attach "$opt" $TESTDIR/$TESTFILE1.1 \
166 166 $TESTDIR/$REPLACEFILE
167 167
168 - $ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
168 + zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
169 169 if [[ $? -eq 0 ]]; then
170 170 log_fail "$REPLACEFILE should not be present."
171 171 fi
172 172
173 173 destroy_pool $TESTPOOL1
174 174 done
175 175 done
176 176
177 177 log_pass
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX