X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=14c5d3b93587e724f59403539c95487350337fa8;hp=0c81610e2698bf8c02e07929cb6b3af341c2bb93;hb=26cc6c4228ae19a8dd522042060852f50bbb621a;hpb=78b7420509c92021dbfd4a91f4dbef5eb99de02a

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 0c81610..14c5d3b 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -900,6 +900,33 @@ zpool_name() {
 }
 
 #
+# Create ZFS storage pool.
+#
+create_zpool() {
+	local facet=$1
+	local poolname=$2
+	local vdev=$3
+	shift 3
+	local opts=${@:-"-o cachefile=none"}
+
+	do_facet $facet "$ZPOOL list -H $poolname >/dev/null 2>&1 ||
+		$ZPOOL create -f $opts $poolname $vdev"
+}
+
+#
+# Create ZFS file system.
+#
+create_zfs() {
+	local facet=$1
+	local dataset=$2
+	shift 2
+	local opts=${@:-"-o mountpoint=legacy"}
+
+	do_facet $facet "$ZFS list -H $dataset >/dev/null 2>&1 ||
+		$ZFS create $opts $dataset"
+}
+
+#
 # Export ZFS storage pool.
 # Before exporting the pool, all datasets within the pool should be unmounted.
 #
@@ -919,6 +946,22 @@ export_zpool() {
 }
 
 #
+# Destroy ZFS storage pool.
+# Destroy the given pool and free up any devices for other use. This command
+# tries to unmount any active datasets before destroying the pool.
+# -f    Force any active datasets contained within the pool to be unmounted.
+#
+destroy_zpool() {
+	local facet=$1
+	local poolname=${2:-$(zpool_name $facet)}
+
+	if [[ -n "$poolname" ]]; then
+		do_facet $facet "! $ZPOOL list -H $poolname >/dev/null 2>&1 ||
+			$ZPOOL destroy -f $poolname"
+	fi
+}
+
+#
 # Import ZFS storage pool.
 # Force importing, even if the pool appears to be potentially active.
 #
@@ -1919,6 +1962,7 @@ wait_update () {
 	local sleep=1
 	local print=10
 
+	PREV_RESULT=$(do_node $node "$TEST")
 	while [ true ]; do
 		RESULT=$(do_node $node "$TEST")
 		if [[ "$RESULT" == "$FINAL" ]]; then
@@ -2569,7 +2613,11 @@ facet_host() {
 	varname=${facet}_HOST
 	if [ -z "${!varname}" ]; then
 		if [ "${facet:0:3}" == "ost" ]; then
-			eval export ${facet}_HOST=${ost_HOST}
+			local fh=${facet%failover}_HOST
+			eval export ${facet}_HOST=${!fh}
+			if [ -z "${!varname}" ]; then
+				eval export ${facet}_HOST=${ost_HOST}
+			fi
 		elif [ "${facet:0:3}" == "mdt" -o \
 			"${facet:0:3}" == "mds" -o \
 			"${facet:0:3}" == "mgs" ]; then
@@ -2855,9 +2903,10 @@ add() {
 	fi
 }
 
+# Device formatted as ost
 ostdevname() {
-    num=$1
-    DEVNAME=OSTDEV$num
+	local num=$1
+	local DEVNAME=OSTDEV$num
 
 	local fstype=$(facet_fstype ost$num)
 
@@ -2866,8 +2915,9 @@ ostdevname() {
 			#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
 		zfs )
-			#dataset name is independent of vdev device names
-			eval DEVPTR=${FSNAME}-ost${num}/ost${num};;
+			#try $OSTZFSDEVn - independent of vdev
+			DEVNAME=OSTZFSDEV$num
+			eval DEVPTR=${!DEVNAME:=${FSNAME}-ost${num}/ost${num}};;
 		* )
 			error "unknown fstype!";;
 	esac
@@ -2875,9 +2925,11 @@ ostdevname() {
     echo -n $DEVPTR
 }
 
+# Physical device location of data
 ostvdevname() {
-	num=$1
-	DEVNAME=OSTDEV$num
+	local num=$1
+	local DEVNAME
+	local VDEVPTR
 
 	local fstype=$(facet_fstype ost$num)
 
@@ -2886,7 +2938,9 @@ ostvdevname() {
 			# vdevs are not supported by ldiskfs
 			eval VDEVPTR="";;
 		zfs )
-			#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
+			#if $OSTDEVn isn't defined, default is $OSTDEVBASE{n}
+			# Device formated by zfs
+			DEVNAME=OSTDEV$num
 			eval VDEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
 		* )
 			error "unknown fstype!";;
@@ -2895,19 +2949,21 @@ ostvdevname() {
 	echo -n $VDEVPTR
 }
 
+# Logical device formated for lustre
 mdsdevname() {
-    num=$1
-    DEVNAME=MDSDEV$num
+	local num=$1
+	local DEVNAME=MDSDEV$num
 
 	local fstype=$(facet_fstype mds$num)
 
 	case $fstype in
 		ldiskfs )
-			#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
+			#if $MDSDEVn isn't defined, default is $MDSDEVBASE{n}
 			eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
 		zfs )
-			#dataset name is independent of vdev device names
-			eval DEVPTR=${FSNAME}-mdt${num}/mdt${num};;
+			# try $MDSZFSDEVn - independent of vdev
+			DEVNAME=MDSZFSDEV$num
+			eval DEVPTR=${!DEVNAME:=${FSNAME}-mdt${num}/mdt${num}};;
 		* )
 			error "unknown fstype!";;
 	esac
@@ -2915,10 +2971,10 @@ mdsdevname() {
 	echo -n $DEVPTR
 }
 
+# Physical location of data
 mdsvdevname() {
-	num=$1
-	DEVNAME=MDSDEV$num
-
+	local VDEVPTR=""
+	local num=$1
 	local fstype=$(facet_fstype mds$num)
 
 	case $fstype in
@@ -2926,7 +2982,9 @@ mdsvdevname() {
 			# vdevs are not supported by ldiskfs
 			eval VDEVPTR="";;
 		zfs )
-			#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
+			# if $MDSDEVn isn't defined, default is $MDSDEVBASE{n}
+			# Device formated by ZFS
+			local DEVNAME=MDSDEV$num
 			eval VDEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
 		* )
 			error "unknown fstype!";;
@@ -2949,10 +3007,11 @@ mgsdevname() {
 		fi;;
 	zfs )
 		if [ $(facet_host mgs) = $(facet_host mds1) ] &&
-		   ( [ -z "$MGSDEV" ] || [ $MGSDEV = $(mdsvdevname 1) ] ); then
+		    ( [ -z "$MGSZFSDEV" ] &&
+			[ -z "$MGSDEV" -o "$MGSDEV" = $(mdsvdevname 1) ] ); then
 			DEVPTR=$(mdsdevname 1)
 		else
-			DEVPTR=${FSNAME}-mgs/mgs
+			DEVPTR=${MGSZFSDEV:-${FSNAME}-mgs/mgs}
 		fi;;
 	* )
 		error "unknown fstype!";;
@@ -2962,8 +3021,7 @@ mgsdevname() {
 }
 
 mgsvdevname() {
-	local VDEVPTR
-	DEVNAME=MGSDEV
+	local VDEVPTR=""
 
 	local fstype=$(facet_fstype mgs)
 
@@ -2973,9 +3031,10 @@ mgsvdevname() {
 		;;
 	zfs )
 		if [ $(facet_host mgs) = $(facet_host mds1) ] &&
-		   ( [ -z "$MGSDEV" ] || [ $MGSDEV = $(mdsvdevname 1) ] ); then
+		   ( [ -z "$MGSDEV" ] &&
+		       [ -z "$MGSZFSDEV" -o "$MGSZFSDEV" = $(mdsdevname 1) ]); then
 			VDEVPTR=$(mdsvdevname 1)
-		else
+		elif [ -n "$MGSDEV" ]; then
 			VDEVPTR=$MGSDEV
 		fi;;
 	* )
@@ -4212,12 +4271,16 @@ drop_update_reply() {
 
 pause_bulk() {
 #define OBD_FAIL_OST_BRW_PAUSE_BULK      0x214
-    RC=0
-    do_facet ost1 lctl set_param fail_loc=0x214
-    do_facet client "$1" || RC=$?
-    do_facet client "sync"
-    do_facet ost1 lctl set_param fail_loc=0
-    return $RC
+	RC=0
+
+	local timeout=${2:-0}
+	# default is (obd_timeout / 4) if unspecified
+	echo "timeout is $timeout/$2"
+	do_facet ost1 lctl set_param fail_val=$timeout fail_loc=0x80000214
+	do_facet client "$1" || RC=$?
+	do_facet client "sync"
+	do_facet ost1 lctl set_param fail_loc=0
+	return $RC
 }
 
 drop_ldlm_cancel() {
@@ -4259,7 +4322,7 @@ clear_failloc() {
 }
 
 set_nodes_failloc () {
-    do_nodes $(comma_list $1)  lctl set_param fail_loc=$2
+	do_nodes $(comma_list $1)  lctl set_param fail_val=0 fail_loc=$2
 }
 
 cancel_lru_locks() {
@@ -6384,6 +6447,32 @@ min_ost_size () {
 }
 
 #
+# Get the available size (KB) of a given obd target.
+#
+get_obd_size() {
+	local facet=$1
+	local obd=$2
+	local size
+
+	[[ $facet != client ]] || return 0
+
+	size=$(do_facet $facet $LCTL get_param -n *.$obd.kbytesavail | head -n1)
+	echo -n $size
+}
+
+#
+# Get the page size (bytes) on a given facet node.
+#
+get_page_size() {
+	local facet=$1
+	local size
+
+	size=$(do_facet $facet getconf PAGE_SIZE)
+	[[ ${PIPESTATUS[0]} = 0 && -n "$size" ]] || size=4096
+	echo -n $size
+}
+
+#
 # Get the block count of the filesystem.
 #
 get_block_count() {