From: Oleg Drokin <green@whamcloud.com>
Date: Thu, 10 Jan 2013 15:42:44 +0000 (-0500)
Subject: Revert "LU-2469 tests: use MDS/OSTDEV and MDS/OSTDEVBASE with zfs"
X-Git-Tag: 2.3.59~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b63efc864794860f84f852ba3c89390676b18070;p=fs%2Flustre-release.git

Revert "LU-2469 tests: use MDS/OSTDEV and MDS/OSTDEVBASE with zfs"

This broke zfs completely apparently

This reverts commit d25e7654f798060f6b671c3b65949a70b8c67f58.
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 41bdd07..8a08dff 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2599,9 +2599,8 @@ ostdevname() {
 			#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
 		zfs )
-			#try $OSTDEVn then $OSTDEVBASE + num then zfs default
-			local foo=${OSTDEVBASE:-${FSNAME}-ost${num}/ost}${num}
-			eval DEVPTR=${!DEVNAME:=$foo};;
+			#dataset name is independent of vdev device names
+			eval DEVPTR=${FSNAME}-ost${num}/ost${num};;
 		* )
 			error "unknown fstype!";;
 	esac
@@ -2640,9 +2639,8 @@ mdsdevname() {
 			#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
 			eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
 		zfs )
-			# try $MDSDEVn then $MDSDEVBASE + num then zfs default
-			local foo=${MDSDEVBASE:-${FSNAME}-mdt${num}/mdt}${num}
-			eval DEVPTR=${!DEVNAME:=$foo};;
+			#dataset name is independent of vdev device names
+			eval DEVPTR=${FSNAME}-mdt${num}/mdt${num};;
 		* )
 			error "unknown fstype!";;
 	esac