From: Vladimir Saveliev <vladimir_saveliev@xyratex.com>
Date: Sun, 3 Nov 2013 03:07:55 +0000 (+0400)
Subject: LU-4218 tests: fix for facet_host()
X-Git-Tag: 2.5.53~40
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=26cc6c4228ae19a8dd522042060852f50bbb621a;hp=5cb9ac9c09f25234babc239ed949d85cd8489bef

LU-4218 tests: fix for facet_host()

When ost_HOST is not set (ost1_HOST, ost2_HOST, etc are used),
facet_host() maps ostNfailover facet (when ostNfailover_HOST is not
set) to default value of ost_HOST, etc hostname.
With this change, facet_host() maps ostNfailover facet to value of
ostN_HOST if it is set, otherwise it resorts to $ost_HOST.

Xyratex-bug-id: MRP-1118
Signed-off-by: Vladimir Saveliev <vladimir_saveliev@xyratex.com>
Change-Id: I23dd7cb0d7de02740ab60f9f86442bc92a4a0300
Reviewed-on: http://review.whamcloud.com/8194
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 5bcd5ba..14c5d3b 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2613,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