From f77ba27d3145cfa32d154a27d9d461797b9d1470 Mon Sep 17 00:00:00 2001
From: Li Wei <liwei@whamcloud.com>
Date: Wed, 25 Jul 2012 12:18:38 +0800
Subject: [PATCH] LU-1670 tests: Load in-tree osd-zfs when necessary

In a developer's environment, Test Framework should try loading osd-zfs
modules from Lustre build trees when ZFS-based targets are used.

Change-Id: I47646738810401c0a48ecc5ca1459952ff811dce
Signed-off-by: Li Wei <liwei@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/3458
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Niu Yawei <niu@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---
 lustre/tests/test-framework.sh | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index eb3d249..c10bff1 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -445,19 +445,26 @@ load_modules_local() {
         grep -q crc16 $SYMLIST || { modprobe crc16 2>/dev/null || true; }
         grep -q -w jbd $SYMLIST || { modprobe jbd 2>/dev/null || true; }
         grep -q -w jbd2 $SYMLIST || { modprobe jbd2 2>/dev/null || true; }
-		if [[ $(node_fstypes $HOSTNAME) == *ldiskfs* ]]; then
-			grep -q exportfs_decode_fh $SYMLIST ||
-			{ modprobe exportfs 2> /dev/null || true; }
-			load_module ../ldiskfs/ldiskfs/ldiskfs
-		fi
 		[ "$LQUOTA" != "no" ] && load_module quota/lquota $LQUOTAOPTS
+		if [[ $(node_fstypes $HOSTNAME) == *zfs* ]]; then
+			load_module osd-zfs/osd_zfs
+		fi
 		load_module mgs/mgs
 		load_module mds/mds
 		load_module mdd/mdd
+		if [[ $(node_fstypes $HOSTNAME) == *ldiskfs* ]]; then
+			#
+			# This block shall be moved up beside osd-zfs as soon
+			# as osd-ldiskfs stops using mdd symbols.
+			#
+			grep -q exportfs_decode_fh $SYMLIST ||
+				{ modprobe exportfs 2> /dev/null || true; }
+			load_module ../ldiskfs/ldiskfs/ldiskfs
+			load_module lvfs/fsfilt_ldiskfs
+			load_module osd-ldiskfs/osd_ldiskfs
+		fi
 		load_module mdt/mdt
-		load_module lvfs/fsfilt_ldiskfs
 		load_module cmm/cmm
-		load_module osd-ldiskfs/osd_ldiskfs
 		load_module ost/ost
 		if [ "$USE_OFD" == yes ]; then
 			load_module ofd/ofd
@@ -2246,6 +2253,8 @@ single_local_node () {
 get_env_vars() {
 	local var
 	local value
+	local facets=$(get_facets)
+	local facet
 
 	for var in ${!MODOPTS_*}; do
 		value=${!var}
@@ -2253,6 +2262,23 @@ get_env_vars() {
 	done
 
 	echo -n " USE_OFD=$USE_OFD"
+
+	for facet in ${facets//,/ }; do
+		var=${facet}_FSTYPE
+		if [ -n "${!var}" ]; then
+			echo -n " $var=${!var}"
+		fi
+	done
+
+	for var in MGSFSTYPE MDSFSTYPE OSTFSTYPE; do
+		if [ -n "${!var}" ]; then
+			echo -n " $var=${!var}"
+		fi
+	done
+
+	if [ -n "$FSTYPE" ]; then
+		echo -n " FSTYPE=$FSTYPE"
+	fi
 }
 
 do_nodes() {
-- 
1.8.3.1