From: Wang Shilong <wshilong@ddn.com>
Date: Thu, 26 Sep 2019 13:21:13 +0000 (+0800)
Subject: LU-12777 test: fix to pass facet to facet_fstype
X-Git-Tag: 2.12.90~42
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=38c8fdfde3953f239bd3d86a91a3213737231ce5

LU-12777 test: fix to pass facet to facet_fstype

Function facet_fstype() expect mgs1 mds1 etc as its
argument, and we used it wrong to pass $mds1 which will
cause following error.

line 1192: lustre-ost1/ost1_FSTYPE: bad substitution

And we fail to detect this is ZFS based OSD, and pool
reimporting will be missed thus failed to mount.

Test-Parameters: trivial clientdistro=el8 testlist=conf-sanity \
                 fstype=zfs envdefinitions=ONLY=103
Test-Parameters: trivial clientdistro=el8 testlist=conf-sanity \
                 fstype=ldiskfs envdefinitions=ONLY=103
Change-Id: Id8fd5b9f17e666614e83e5c1a2399fde8b91b023
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-on: https://review.whamcloud.com/36298
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 7b3f25a..27fc2b1 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -7408,34 +7408,34 @@ test_renamefs() {
 	echo "rename $FSNAME to $newname"
 
 	if ! combined_mgs_mds ; then
-		local facet=$(mgsdevname)
+		local dev=$(mgsdevname)
 
 		do_facet mgs \
-			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"||
-			error "(7) Fail to rename MGS"
-		if [ "$(facet_fstype $facet)" = "zfs" ]; then
+			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" ||
+				error "(7) Fail to rename MGS"
+		if [ "$(facet_fstype mgs)" = "zfs" ]; then
 			reimport_zpool mgs $newname-mgs
 		fi
 	fi
 
 	for num in $(seq $MDSCOUNT); do
-		local facet=$(mdsdevname $num)
+		local dev=$(mdsdevname $num)
 
 		do_facet mds${num} \
-			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"||
-			error "(8) Fail to rename MDT $num"
-		if [ "$(facet_fstype $facet)" = "zfs" ]; then
+			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" ||
+				error "(8) Fail to rename MDT $num"
+		if [ "$(facet_fstype mds${num})" = "zfs" ]; then
 			reimport_zpool mds${num} $newname-mdt${num}
 		fi
 	done
 
 	for num in $(seq $OSTCOUNT); do
-		local facet=$(ostdevname $num)
+		local dev=$(ostdevname $num)
 
 		do_facet ost${num} \
-			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"||
-			error "(9) Fail to rename OST $num"
-		if [ "$(facet_fstype $facet)" = "zfs" ]; then
+			"$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" ||
+				error "(9) Fail to rename OST $num"
+		if [ "$(facet_fstype ost${num})" = "zfs" ]; then
 			reimport_zpool ost${num} $newname-ost${num}
 		fi
 	done