Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Update zconfig.sh to use new zvol names 

This change should have occured when we commited the new udev
rules for zvols.  Basically, the test script is just out of date.
We need to update it to use the /dev/zvol/ device names, and
to expect the more common -partN suffixes.

I added a udev_trigger() call in zconfig_partition() and
zconfig_zvol_device_stat() to ensure that all the udev rules have
run before.  This ensures the devices are available to subsequent
commands and closes a small race.

Finally, I was forced added a small 'sleep 1' to test 10.  I
was observing occassional failures in my VM due to the device
still claiming to be busy.  Delaying betwen the various methods
of adding/removing a vdev avoids the issue.

Closes #207
This commit is contained in:
Brian Behlendorf 2011-04-19 16:14:15 -07:00
parent 18f4238277
commit 3fce1d0962
1 changed files with 99 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
scripts/zconfig.sh
View File

@ -92,6 +92,7 @@ ${START},${END}
EOF EOF
rm ${TMP_FILE} rm ${TMP_FILE}
udev_trigger
} }
# Validate persistent zpool.cache configuration. # Validate persistent zpool.cache configuration.
@ -155,32 +156,32 @@ run_test 2 "scan disks for pools to import"
zconfig_zvol_device_stat() { zconfig_zvol_device_stat() {
local EXPECT=$1 local EXPECT=$1
local POOL_NAME=/dev/$2 local POOL_NAME=/dev/zvol/$2
local ZVOL_NAME=/dev/$3 local ZVOL_NAME=/dev/zvol/$3
local SNAP_NAME=/dev/$4 local SNAP_NAME=/dev/zvol/$4
local CLONE_NAME=/dev/$5 local CLONE_NAME=/dev/zvol/$5
local COUNT=0 local COUNT=0
# Briefly delay for udev # Briefly delay for udev
sleep 3 udev_trigger
# Pool exists # Pool exists
stat ${POOL_NAME} &>/dev/null && let COUNT=$COUNT+1 stat ${POOL_NAME} &>/dev/null && let COUNT=$COUNT+1
# Volume and partitions # Volume and partitions
stat ${ZVOL_NAME} &>/dev/null && let COUNT=$COUNT+1 stat ${ZVOL_NAME} &>/dev/null && let COUNT=$COUNT+1
stat ${ZVOL_NAME}1 &>/dev/null && let COUNT=$COUNT+1 stat ${ZVOL_NAME}-part1 &>/dev/null && let COUNT=$COUNT+1
stat ${ZVOL_NAME}2 &>/dev/null && let COUNT=$COUNT+1 stat ${ZVOL_NAME}-part2 &>/dev/null && let COUNT=$COUNT+1
# Snapshot with partitions # Snapshot with partitions
stat ${SNAP_NAME} &>/dev/null && let COUNT=$COUNT+1 stat ${SNAP_NAME} &>/dev/null && let COUNT=$COUNT+1
stat ${SNAP_NAME}1 &>/dev/null && let COUNT=$COUNT+1 stat ${SNAP_NAME}-part1 &>/dev/null && let COUNT=$COUNT+1
stat ${SNAP_NAME}2 &>/dev/null && let COUNT=$COUNT+1 stat ${SNAP_NAME}-part2 &>/dev/null && let COUNT=$COUNT+1
# Clone with partitions # Clone with partitions
stat ${CLONE_NAME} &>/dev/null && let COUNT=$COUNT+1 stat ${CLONE_NAME} &>/dev/null && let COUNT=$COUNT+1
stat ${CLONE_NAME}1 &>/dev/null && let COUNT=$COUNT+1 stat ${CLONE_NAME}-part1 &>/dev/null && let COUNT=$COUNT+1
stat ${CLONE_NAME}2 &>/dev/null && let COUNT=$COUNT+1 stat ${CLONE_NAME}-part2 &>/dev/null && let COUNT=$COUNT+1
if [ $EXPECT -ne $COUNT ]; then if [ $EXPECT -ne $COUNT ]; then
return 1 return 1
@ -205,7 +206,7 @@ test_3() {
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3 ${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3
zconfig_partition /dev/${FULL_ZVOL_NAME} 0 64 || fail 4 zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 64 || fail 4
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5
${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6 ${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6
@ -256,7 +257,7 @@ test_4() {
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3 ${ZFS} create -V 100M ${FULL_ZVOL_NAME} || fail 3
zconfig_partition /dev/${FULL_ZVOL_NAME} 0 64 || fail 4 zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 64 || fail 4
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 5
${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6 ${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 6
@ -302,29 +303,30 @@ test_5() {
# Create a pool and volume. # Create a pool and volume.
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raid0 || fail 2
${ZFS} create -V 400M ${FULL_NAME} || fail 3 ${ZFS} create -V 800M ${FULL_NAME} || fail 3
# Partition the volume, for a 400M volume there will be # Partition the volume, for a 800M volume there will be
# 812 cylinders, 16 heads, and 63 sectors per track. # 1624 cylinders, 16 heads, and 63 sectors per track.
zconfig_partition /dev/${FULL_NAME} 0 812 zconfig_partition /dev/zvol/${FULL_NAME} 0 1624
# Format the partition with ext3. # Format the partition with ext3.
/sbin/mkfs.ext3 -q /dev/${FULL_NAME}1 || fail 5 /sbin/mkfs.ext3 -q /dev/zvol/${FULL_NAME}-part1 || fail 5
# Mount the ext3 filesystem and copy some data to it. # Mount the ext3 filesystem and copy some data to it.
mkdir -p /tmp/${ZVOL_NAME}1 || fail 6 mkdir -p /tmp/${ZVOL_NAME}-part1 || fail 6
mount /dev/${FULL_NAME}1 /tmp/${ZVOL_NAME}1 || fail 7 mount /dev/zvol/${FULL_NAME}-part1 /tmp/${ZVOL_NAME}-part1 || fail 7
cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}1 || fail 8 cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}-part1 || fail 8
sync sync
# Verify the copied files match the original files. # Verify the copied files match the original files.
diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}1${SRC_DIR} &>/dev/null || fail 9 diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}-part1${SRC_DIR} \
&>/dev/null || fail 9
# Remove the files, umount, destroy the volume and pool. # Remove the files, umount, destroy the volume and pool.
rm -Rf /tmp/${ZVOL_NAME}1${SRC_DIR}* || fail 10 rm -Rf /tmp/${ZVOL_NAME}-part1${SRC_DIR}* || fail 10
umount /tmp/${ZVOL_NAME}1 || fail 11 umount /tmp/${ZVOL_NAME}-part1 || fail 11
rmdir /tmp/${ZVOL_NAME}1 || fail 12 rmdir /tmp/${ZVOL_NAME}-part1 || fail 12
${ZFS} destroy ${FULL_NAME} || fail 13 ${ZFS} destroy ${FULL_NAME} || fail 13
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 14 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 14
@ -347,42 +349,46 @@ test_6() {
# Create a pool and volume. # Create a pool and volume.
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raid0 || fail 2
${ZFS} create -V 400M ${FULL_ZVOL_NAME} || fail 3 ${ZFS} create -V 800M ${FULL_ZVOL_NAME} || fail 3
# Partition the volume, for a 400M volume there will be # Partition the volume, for a 800M volume there will be
# 812 cylinders, 16 heads, and 63 sectors per track. # 1624 cylinders, 16 heads, and 63 sectors per track.
zconfig_partition /dev/${FULL_ZVOL_NAME} 0 812 zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 1624
# Format the partition with ext2 (no journal). # Format the partition with ext2 (no journal).
/sbin/mkfs.ext2 -q /dev/${FULL_ZVOL_NAME}1 || fail 5 /sbin/mkfs.ext2 -q /dev/zvol/${FULL_ZVOL_NAME}-part1 || fail 5
# Mount the ext3 filesystem and copy some data to it. # Mount the ext3 filesystem and copy some data to it.
mkdir -p /tmp/${ZVOL_NAME}1 || fail 6 mkdir -p /tmp/${ZVOL_NAME}-part1 || fail 6
mount /dev/${FULL_ZVOL_NAME}1 /tmp/${ZVOL_NAME}1 || fail 7 mount /dev/zvol/${FULL_ZVOL_NAME}-part1 /tmp/${ZVOL_NAME}-part1 \
|| fail 7
# Snapshot the pristine ext2 filesystem and mount it read-only. # Snapshot the pristine ext2 filesystem and mount it read-only.
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8
wait_udev /dev/${FULL_SNAP_NAME}1 30 || fail 8 wait_udev /dev/zvol/${FULL_SNAP_NAME}-part1 30 || fail 8
mkdir -p /tmp/${SNAP_NAME}1 || fail 9 mkdir -p /tmp/${SNAP_NAME}-part1 || fail 9
mount /dev/${FULL_SNAP_NAME}1 /tmp/${SNAP_NAME}1 &>/dev/null || fail 10 mount /dev/zvol/${FULL_SNAP_NAME}-part1 /tmp/${SNAP_NAME}-part1 \
&>/dev/null || fail 10
# Copy to original volume # Copy to original volume
cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}1 || fail 11 cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}-part1 || fail 11
sync sync
# Verify the copied files match the original files, # Verify the copied files match the original files,
# and the copied files do NOT appear in the snapshot. # and the copied files do NOT appear in the snapshot.
diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}1${SRC_DIR} &>/dev/null || fail 12 diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}-part1${SRC_DIR} \
diff -ur ${SRC_DIR} /tmp/${SNAP_NAME}1${SRC_DIR} &>/dev/null && fail 13 &>/dev/null || fail 12
diff -ur ${SRC_DIR} /tmp/${SNAP_NAME}-part1${SRC_DIR} \
&>/dev/null && fail 13
# umount, destroy the snapshot, volume, and pool. # umount, destroy the snapshot, volume, and pool.
umount /tmp/${SNAP_NAME}1 || fail 14 umount /tmp/${SNAP_NAME}-part1 || fail 14
rmdir /tmp/${SNAP_NAME}1 || fail 15 rmdir /tmp/${SNAP_NAME}-part1 || fail 15
${ZFS} destroy ${FULL_SNAP_NAME} || fail 16 ${ZFS} destroy ${FULL_SNAP_NAME} || fail 16
umount /tmp/${ZVOL_NAME}1 || fail 17 umount /tmp/${ZVOL_NAME}-part1 || fail 17
rmdir /tmp/${ZVOL_NAME}1 || fail 18 rmdir /tmp/${ZVOL_NAME}-part1 || fail 18
${ZFS} destroy ${FULL_ZVOL_NAME} || fail 19 ${ZFS} destroy ${FULL_ZVOL_NAME} || fail 19
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 20 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 20
@ -412,59 +418,67 @@ test_7() {
# Partition the volume, for a 300M volume there will be # Partition the volume, for a 300M volume there will be
# 609 cylinders, 16 heads, and 63 sectors per track. # 609 cylinders, 16 heads, and 63 sectors per track.
zconfig_partition /dev/${FULL_ZVOL_NAME} 0 609 zconfig_partition /dev/zvol/${FULL_ZVOL_NAME} 0 609
# Format the partition with ext2 (no journal). # Format the partition with ext2 (no journal).
/sbin/mkfs.ext2 -q /dev/${FULL_ZVOL_NAME}1 || fail 5 /sbin/mkfs.ext2 -q /dev/zvol/${FULL_ZVOL_NAME}-part1 || fail 5
# Mount the ext3 filesystem and copy some data to it. # Mount the ext3 filesystem and copy some data to it.
mkdir -p /tmp/${ZVOL_NAME}1 || fail 6 mkdir -p /tmp/${ZVOL_NAME}-part1 || fail 6
mount /dev/${FULL_ZVOL_NAME}1 /tmp/${ZVOL_NAME}1 || fail 7 mount /dev/zvol/${FULL_ZVOL_NAME}-part1 /tmp/${ZVOL_NAME}-part1 \
|| fail 7
# Snapshot the pristine ext2 filesystem and mount it read-only. # Snapshot the pristine ext2 filesystem and mount it read-only.
${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8 ${ZFS} snapshot ${FULL_SNAP_NAME} || fail 8
wait_udev /dev/${FULL_SNAP_NAME}1 30 || fail 8 wait_udev /dev/zvol/${FULL_SNAP_NAME}-part1 30 || fail 8
mkdir -p /tmp/${SNAP_NAME}1 || fail 9 mkdir -p /tmp/${SNAP_NAME}-part1 || fail 9
mount /dev/${FULL_SNAP_NAME}1 /tmp/${SNAP_NAME}1 &>/dev/null || fail 10 mount /dev/zvol/${FULL_SNAP_NAME}-part1 \
/tmp/${SNAP_NAME}-part1 &>/dev/null || fail 10
# Copy to original volume. # Copy to original volume.
cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}1 || fail 11 cp -RL ${SRC_DIR} /tmp/${ZVOL_NAME}-part1 || fail 11
sync sync
# Verify the copied files match the original files, # Verify the copied files match the original files,
# and the copied files do NOT appear in the snapshot. # and the copied files do NOT appear in the snapshot.
diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}1${SRC_DIR} &>/dev/null || fail 12 diff -ur ${SRC_DIR} /tmp/${ZVOL_NAME}-part1${SRC_DIR} \
diff -ur ${SRC_DIR} /tmp/${SNAP_NAME}1${SRC_DIR} &>/dev/null && fail 13 &>/dev/null || fail 12
diff -ur ${SRC_DIR} /tmp/${SNAP_NAME}-part1${SRC_DIR} \
&>/dev/null && fail 13
# Clone from the original pristine snapshot # Clone from the original pristine snapshot
${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 14 ${ZFS} clone ${FULL_SNAP_NAME} ${FULL_CLONE_NAME} || fail 14
wait_udev /dev/${FULL_CLONE_NAME}1 30 || fail 14 wait_udev /dev/zvol/${FULL_CLONE_NAME}-part1 30 || fail 14
mkdir -p /tmp/${CLONE_NAME}1 || fail 15 mkdir -p /tmp/${CLONE_NAME}-part1 || fail 15
mount /dev/${FULL_CLONE_NAME}1 /tmp/${CLONE_NAME}1 || fail 16 mount /dev/zvol/${FULL_CLONE_NAME}-part1 \
/tmp/${CLONE_NAME}-part1 || fail 16
# Verify the clone matches the pristine snapshot, # Verify the clone matches the pristine snapshot,
# and the files copied to the original volume are NOT there. # and the files copied to the original volume are NOT there.
diff -ur /tmp/${SNAP_NAME}1 /tmp/${CLONE_NAME}1 &>/dev/null || fail 17 diff -ur /tmp/${SNAP_NAME}-part1 /tmp/${CLONE_NAME}-part1 \
diff -ur /tmp/${ZVOL_NAME}1 /tmp/${CLONE_NAME}1 &>/dev/null && fail 18 &>/dev/null || fail 17
diff -ur /tmp/${ZVOL_NAME}-part1 /tmp/${CLONE_NAME}-part1 \
&>/dev/null && fail 18
# Copy to cloned volume. # Copy to cloned volume.
cp -RL ${SRC_DIR} /tmp/${CLONE_NAME}1 || fail 19 cp -RL ${SRC_DIR} /tmp/${CLONE_NAME}-part1 || fail 19
sync sync
# Verify the clone matches the modified original volume. # Verify the clone matches the modified original volume.
diff -ur /tmp/${ZVOL_NAME}1 /tmp/${CLONE_NAME}1 &>/dev/null || fail 20 diff -ur /tmp/${ZVOL_NAME}-part1 /tmp/${CLONE_NAME}-part1 \
&>/dev/null || fail 20
# umount, destroy the snapshot, volume, and pool. # umount, destroy the snapshot, volume, and pool.
umount /tmp/${CLONE_NAME}1 || fail 21 umount /tmp/${CLONE_NAME}-part1 || fail 21
rmdir /tmp/${CLONE_NAME}1 || fail 22 rmdir /tmp/${CLONE_NAME}-part1 || fail 22
${ZFS} destroy ${FULL_CLONE_NAME} || fail 23 ${ZFS} destroy ${FULL_CLONE_NAME} || fail 23
umount /tmp/${SNAP_NAME}1 || fail 24 umount /tmp/${SNAP_NAME}-part1 || fail 24
rmdir /tmp/${SNAP_NAME}1 || fail 25 rmdir /tmp/${SNAP_NAME}-part1 || fail 25
${ZFS} destroy ${FULL_SNAP_NAME} || fail 26 ${ZFS} destroy ${FULL_SNAP_NAME} || fail 26
umount /tmp/${ZVOL_NAME}1 || fail 27 umount /tmp/${ZVOL_NAME}-part1 || fail 27
rmdir /tmp/${ZVOL_NAME}1 || fail 28 rmdir /tmp/${ZVOL_NAME}-part1 || fail 28
${ZFS} destroy ${FULL_ZVOL_NAME} || fail 29 ${ZFS} destroy ${FULL_ZVOL_NAME} || fail 29
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 30 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 30
@ -496,39 +510,41 @@ test_8() {
# Partition the volume, for a 300M volume there will be # Partition the volume, for a 300M volume there will be
# 609 cylinders, 16 heads, and 63 sectors per track. # 609 cylinders, 16 heads, and 63 sectors per track.
zconfig_partition /dev/${FULL_ZVOL_NAME1} 0 609 zconfig_partition /dev/zvol/${FULL_ZVOL_NAME1} 0 609
# Format the partition with ext2. # Format the partition with ext2.
/sbin/mkfs.ext2 -q /dev/${FULL_ZVOL_NAME1}1 || fail 5 /sbin/mkfs.ext2 -q /dev/zvol/${FULL_ZVOL_NAME1}-part1 || fail 5
# Mount the ext3 filesystem and copy some data to it. # Mount the ext3 filesystem and copy some data to it.
mkdir -p /tmp/${FULL_ZVOL_NAME1}1 || fail 6 mkdir -p /tmp/${FULL_ZVOL_NAME1}-part1 || fail 6
mount /dev/${FULL_ZVOL_NAME1}1 /tmp/${FULL_ZVOL_NAME1}1 || fail 7 mount /dev/zvol/${FULL_ZVOL_NAME1}-part1 \
cp -RL ${SRC_DIR} /tmp/${FULL_ZVOL_NAME1}1 || fail 8 /tmp/${FULL_ZVOL_NAME1}-part1 || fail 7
cp -RL ${SRC_DIR} /tmp/${FULL_ZVOL_NAME1}-part1 || fail 8
sync || fail 9 sync || fail 9
# Snapshot the ext3 filesystem so it may be sent. # Snapshot the ext3 filesystem so it may be sent.
${ZFS} snapshot ${FULL_SNAP_NAME1} || fail 11 ${ZFS} snapshot ${FULL_SNAP_NAME1} || fail 11
wait_udev /dev/${FULL_SNAP_NAME1} 30 || fail 11 wait_udev /dev/zvol/${FULL_SNAP_NAME1} 30 || fail 11
# Send/receive the snapshot from POOL_NAME1 to POOL_NAME2 # Send/receive the snapshot from POOL_NAME1 to POOL_NAME2
(${ZFS} send ${FULL_SNAP_NAME1} | \ (${ZFS} send ${FULL_SNAP_NAME1} | \
${ZFS} receive ${FULL_ZVOL_NAME2}) || fail 12 ${ZFS} receive ${FULL_ZVOL_NAME2}) || fail 12
wait_udev /dev/${FULL_ZVOL_NAME2}1 30 || fail 12 wait_udev /dev/zvol/${FULL_ZVOL_NAME2}-part1 30 || fail 12
# Mount the sent ext3 filesystem. # Mount the sent ext3 filesystem.
mkdir -p /tmp/${FULL_ZVOL_NAME2}1 || fail 13 mkdir -p /tmp/${FULL_ZVOL_NAME2}-part1 || fail 13
mount /dev/${FULL_ZVOL_NAME2}1 /tmp/${FULL_ZVOL_NAME2}1 || fail 14 mount /dev/zvol/${FULL_ZVOL_NAME2}-part1 \
/tmp/${FULL_ZVOL_NAME2}-part1 || fail 14
# Verify the contents of the volumes match # Verify the contents of the volumes match
diff -ur /tmp/${FULL_ZVOL_NAME1}1 /tmp/${FULL_ZVOL_NAME2}1 \ diff -ur /tmp/${FULL_ZVOL_NAME1}-part1 /tmp/${FULL_ZVOL_NAME2}-part1 \
&>/dev/null || fail 15 &>/dev/null || fail 15
# Umount, destroy the volume and pool. # Umount, destroy the volume and pool.
umount /tmp/${FULL_ZVOL_NAME1}1 || fail 16 umount /tmp/${FULL_ZVOL_NAME1}-part1 || fail 16
umount /tmp/${FULL_ZVOL_NAME2}1 || fail 17 umount /tmp/${FULL_ZVOL_NAME2}-part1 || fail 17
rmdir /tmp/${FULL_ZVOL_NAME1}1 || fail 18 rmdir /tmp/${FULL_ZVOL_NAME1}-part1 || fail 18
rmdir /tmp/${FULL_ZVOL_NAME2}1 || fail 19 rmdir /tmp/${FULL_ZVOL_NAME2}-part1 || fail 19
rmdir /tmp/${POOL_NAME1} || fail 20 rmdir /tmp/${POOL_NAME1} || fail 20
rmdir /tmp/${POOL_NAME2} || fail 21 rmdir /tmp/${POOL_NAME2} || fail 21
@ -647,12 +663,14 @@ test_10() {
${ZPOOL} remove ${POOL_NAME} ${SDDEVICE} || fail 5 ${ZPOOL} remove ${POOL_NAME} ${SDDEVICE} || fail 5
${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 6 ${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 6
cmp ${TMP_FILE1} ${TMP_FILE2} || fail 7 cmp ${TMP_FILE1} ${TMP_FILE2} || fail 7
sleep 1
# Add and remove a cache vdev by shorthand path # Add and remove a cache vdev by shorthand path
zconfig_add_vdev ${POOL_NAME} cache ${BASE_SDDEVICE} || fail 8 zconfig_add_vdev ${POOL_NAME} cache ${BASE_SDDEVICE} || fail 8
${ZPOOL} remove ${POOL_NAME} ${BASE_SDDEVICE} || fail 9 ${ZPOOL} remove ${POOL_NAME} ${BASE_SDDEVICE} || fail 9
${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 10 ${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 10
cmp ${TMP_FILE1} ${TMP_FILE2} || fail 11 cmp ${TMP_FILE1} ${TMP_FILE2} || fail 11
sleep 1
# Add and remove a log vdev # Add and remove a log vdev
zconfig_add_vdev ${POOL_NAME} log ${BASE_SDDEVICE} || fail 12 zconfig_add_vdev ${POOL_NAME} log ${BASE_SDDEVICE} || fail 12
@ -671,4 +689,3 @@ test_10() {
run_test 10 "zpool add/remove vdev" run_test 10 "zpool add/remove vdev"
exit 0 exit 0