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

Remove explicit import from zconfig test 1. 

Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load.  Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
This commit is contained in:
Brian Behlendorf 2010-05-18 16:15:57 -07:00
parent 4e7fd8ff9d
commit d28ada9eaa
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/zconfig.sh
View File

@ -64,20 +64,16 @@ zconfig_test1() {
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3 ${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3
# Unload/load the module stack to clear any configuration state # Unload/load the module stack and verify the pool persists.
# then verify the pool is defined in the cache file, it can be
# imported without error, and it matches the original pool.
${ZFS_SH} -u || fail 4 ${ZFS_SH} -u || fail 4
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 5 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 5
${ZPOOL} import -c ${TMP_CACHE} | grep ${POOL_NAME} >/dev/null||fail 6 ${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 6
${ZPOOL} import -c ${TMP_CACHE} ${POOL_NAME} || fail 7 cmp ${TMP_FILE1} ${TMP_FILE2} || fail 7
${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 8
cmp ${TMP_FILE1} ${TMP_FILE2} || fail 9
# Cleanup the test pool and temporary files # Cleanup the test pool and temporary files
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 10 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 8
rm -f ${TMP_FILE1} ${TMP_FILE2} ${TMP_CACHE} || fail 11 rm -f ${TMP_FILE1} ${TMP_FILE2} ${TMP_CACHE} || fail 9
${ZFS_SH} -u || fail 12 ${ZFS_SH} -u || fail 10
pass pass
} }
@ -97,9 +93,9 @@ zconfig_test2() {
${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2 ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3 ${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3
# Unload/load the module stack to clear any configuration state # Unload the module stack, remove the cache file, load the module
# then remove the cache file, probe the disks for pools, import # stack and attempt to probe the disks to import the pool. As
# the pool without error, and match it against the original pool. # a cross check verify the old pool state against the imported.
${ZFS_SH} -u || fail 4 ${ZFS_SH} -u || fail 4
rm -f ${TMP_CACHE} || fail 5 rm -f ${TMP_CACHE} || fail 5
${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 6 ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 6