From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Fri, 14 Mar 2014 20:39:21 +0000 (-0400)
Subject: LU-2524 tests: enable conf-sanity/58 on ZFS
X-Git-Tag: 2.5.58~91
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F9675%2F2;p=fs%2Flustre-release.git

LU-2524 tests: enable conf-sanity/58 on ZFS

Fix mount/unmount of MDS so test runs correctly on ZFS MDS.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Ifb9bd12fdecdc38132dfc487f565b67f7ade4123
Reviewed-on: http://review.whamcloud.com/9675
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Isaac Huang <he.huang@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 2652c5d..b902571 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -3577,10 +3577,6 @@ count_osts() {
 }
 
 test_58() { # bug 22658
-	if [ $(facet_fstype mds) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
-		return
-	fi
 	setup_noconfig
 	mkdir -p $DIR/$tdir
 	createmany -o $DIR/$tdir/$tfile-%d 100
@@ -3592,15 +3588,13 @@ test_58() { # bug 22658
 
 	local MNTDIR=$(facet_mntpt $SINGLEMDS)
 	local devname=$(mdsdevname ${SINGLEMDS//mds/})
-	local opts=""
-	if ! do_facet $SINGLEMDS "test -b $devname"; then
-		opts="-o loop"
-	fi
 
 	# remove all files from the OBJECTS dir
-	do_facet $SINGLEMDS "mount -t ldiskfs $opts $devname $MNTDIR"
+	mount_fstype $SINGLEMDS
+
 	do_facet $SINGLEMDS "find $MNTDIR/O/1/d* -type f -delete"
-	do_facet $SINGLEMDS "umount -d $MNTDIR"
+
+	unmount_fstype $SINGLEMDS
 	# restart MDS with missing llog files
 	start_mds
 	do_facet mds "lctl set_param fail_loc=0"