From 5d4c60fabed88c17b30379b6c317f10cf466a723 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 6 Oct 2009 12:12:05 -0700
Subject: Use alternate /etc/zfs/zpool.cache file for in-tree tests

Pass an alternate location via module option for the zpool.cache file
used by the kernel.  This allows us to write in-tree tests which do
not modify any out-of-tree files we do not own.  This is just standard
good behavior for any test suite.

Additionally, refine the existing test case to explicity use the cache
file when looking for pools to import.  And add a second test cache
which is forced to probe the disks for available pools to import.
---
 scripts/Makefile.am |  4 ++--
 scripts/zconfig.sh  | 60 +++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 49 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 977535130..c8cf54d2f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -20,9 +20,9 @@ check:
 	@$(ZFS) -u
 	@echo
 	@echo
-	@echo -n "===================================="
+	@echo -n "==================================="
 	@echo -n " ZCONFIG "
-	@echo    "===================================="
+	@echo    "==================================="
 	@echo
 	@$(ZCONFIG)
 	@echo
diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index a90d984fc..7a215dcee 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -53,32 +53,66 @@ zconfig_test1() {
 	POOL_NAME=test1
 	TMP_FILE1=`mktemp`
 	TMP_FILE2=`mktemp`
+	TMP_CACHE=`mktemp -p /tmp zpool.cache.XXXXXXXX`
 
 	echo -n "test 1 - persistent zpool.cache: "
 
 	# Create a pool save its status for comparison.
-	${ZFS_SH} || fail 1
+	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
 	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
 	${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3
 
 	# Unload/load the module stack to clear any configuration state
-	# then verify that the pool can be imported and is online.
+	# 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} || fail 5
-	${ZPOOL} import ${POOL_NAME} || fail 6
-	${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 7
+	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 5
+	${ZPOOL} import -c ${TMP_CACHE} | grep ${POOL_NAME} >/dev/null||fail 6
+	${ZPOOL} import -c ${TMP_CACHE} ${POOL_NAME} || fail 7
+	${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 8
+	cmp ${TMP_FILE1} ${TMP_FILE2} || fail 9
 
-	# Compare the original and imported pool status they should match
-	cmp ${TMP_FILE1} ${TMP_FILE2} || fail 8
-
-	# Cleanup the test pool and temporary file
-	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 9
-	rm -f ${TMP_FILE1} ${TMP_FILE2} || fail 10
-	${ZFS_SH} -u || fail 11
+	# Cleanup the test pool and temporary files
+	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 10
+	rm -f ${TMP_FILE1} ${TMP_FILE2} ${TMP_CACHE} || fail 11
+	${ZFS_SH} -u || fail 12
 
 	pass
 }
-
 zconfig_test1
 
+# Validate ZFS disk scanning and import w/out zpool.cache configuration.
+zconfig_test2() {
+	POOL_NAME=test2
+	TMP_FILE1=`mktemp`
+	TMP_FILE2=`mktemp`
+	TMP_CACHE=`mktemp -p /tmp zpool.cache.XXXXXXXX`
+
+	echo -n "test 2 - scan disks for pools to import: "
+
+	# Create a pool save its status for comparison.
+	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
+	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
+	${ZPOOL} status ${POOL_NAME} >${TMP_FILE1} || fail 3
+
+	# Unload/load the module stack to clear any configuration state
+	# then remove the cache file, probe the disks for pools, import
+	# the pool without error, and match it against the original pool.
+	${ZFS_SH} -u || fail 4
+	rm -f ${TMP_CACHE} || fail 5
+	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 6
+	${ZPOOL} import | grep ${POOL_NAME} >/dev/null || fail 7
+	${ZPOOL} import ${POOL_NAME} || fail 8
+	${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 9
+	cmp ${TMP_FILE1} ${TMP_FILE2} || fail 10
+
+	# Cleanup the test pool and temporary files
+	${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 -d || fail 11
+	rm -f ${TMP_FILE1} ${TMP_FILE2} || fail 12
+	${ZFS_SH} -u || fail 13
+
+	pass
+}
+zconfig_test2
+
 exit 0
-- 
cgit v1.2.3