From: wangdi <di.wang@whamcloud.com>
Date: Sat, 8 Dec 2012 22:23:23 +0000 (-0800)
Subject: LU-1187 tests: define MGSDEV in right way.
X-Git-Tag: 2.3.58~66
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=edefa755da1728e9b5ec1fef990bead16f290cb6;p=fs%2Flustre-release.git

LU-1187 tests: define MGSDEV in right way.

For Combined mgs/mds, MGSDEV definition should be same for
LDISKFS and ZFS.

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Signed-off-by: Wang Di <di.wang@whamcloud.com>
Change-Id: I107990a97e7daa0d72be874125ced65f3ed6c337
Reviewed-on: http://review.whamcloud.com/4774
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 6d31bf2..e89d50c 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2676,12 +2676,10 @@ mgsdevname() {
 	local fstype=$(facet_fstype mds1)
 
 	case $fstype in
-		ldiskfs )
+		ldiskfs|zfs )
 			#if $MGSDEV isn't defined, default is $MDSDEV1
+			#ZFS independent mgsdev should be ${FSNAME}-mgs/mgs
 			eval DEVPTR=${!DEVNAME:=${MDSDEV1}};;
-		zfs )
-			#dataset name is independent of vdev device names
-			eval DEVPTR=${FSNAME}-mgs/mgs;;
 		* )
 			error "unknown fstype!";;
 	esac