From 5e5e25e8519e3a31a1aca93c87850fc45569b112 Mon Sep 17 00:00:00 2001
From: James Nunez <james.a.nunez@intel.com>
Date: Tue, 27 Mar 2018 18:28:49 +0000
Subject: [PATCH] Revert "LU-6867 test: detect active facet based on current
 state"

This reverts commit 643e3b4316b6c59009c259b96d38495152989df4.

conf-sanity is failing with rmmod errors for Ubuntu clients; LU-10827.
Reverting this patch fixes the issue.


Change-Id: I455d87ea1e2f661c6129c9de577fc660d68d4c4b
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Reviewed-on: https://review.whamcloud.com/31798
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre/tests/sanity-hsm.sh     |  2 --
 lustre/tests/test-framework.sh | 68 +++++++++++-------------------------------
 2 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index b877276..d7b6d64 100755
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -100,8 +100,6 @@ init_agt_vars() {
 				agent=CLIENT2
 		fi
 		eval export agt${n}_HOST=\$\{agt${n}_HOST:-${!agent}\}
-		local var=agt${n}_HOST
-		[[ ! -z "${!var}" ]] || error "agt${n}_HOST is empty!"
 	done
 
 	export SINGLEAGT=${SINGLEAGT:-agt1}
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 88b2f1c..64e0e59 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3582,59 +3582,20 @@ facet_failover_host() {
 	fi
 }
 
-detect_active() {
-	local facet=$1
-	[ "$CLIENTONLY" ] && echo $facet && return
-
-	local failover=$(facet_failover_host $facet)
-
-	# failover is not associated with all facet types:
-	# "AGT" facet type (remote HSM agents) does not
-	# have a failover.
-	[[ -z "$failover" ]] && echo $facet && return
-
-	local host=$(facet_host $facet)
-	local dev=$(facet_device $facet)
-
-	# ${facet}_svc can not be used here because of
-	# facet_active() is called before this var initialized
-	local svc=$(do_node $host $E2LABEL ${dev})
-
-	# active facet is ${facet}failover if device is mounted on failover
-	# on other cases active facet is $facet
-	[[ $dev = $(do_node $failover \
-			lctl get_param -n *.$svc.mntdev 2>/dev/null) ]] &&
-		echo ${facet}failover && return
-
-	echo $facet
-}
-
-init_active() {
-	local facet=$1
-
-	local active=$(detect_active $facet)
-	echo "${facet}active=$active" > $TMP/${facet}active
-}
-
 facet_active() {
-	local facet=$1
-	local activevar=${facet}active
+    local facet=$1
+    local activevar=${facet}active
 
-	# file is missing (nothing to store) if fail() is not
-	# executed during this test session yet;
-	# file content:
-	#      ost1active=ost1failover
-	#      ost1active=ost1
-	# let's detect active facet based on current lustre state
-	if [ ! -f $TMP/${facet}active ] ; then
-		init_active $facet
-	fi
-	source $TMP/${facet}active
+    if [ -f $TMP/${facet}active ] ; then
+        source $TMP/${facet}active
+    fi
 
-	# is ${facet}active set somewhere else?
-	active=${!activevar}
-	[[ -z "$active" ]] && exit 1
-	echo -n ${active}
+    active=${!activevar}
+    if [ -z "$active" ] ; then
+        echo -n ${facet}
+    else
+        echo -n ${active}
+    fi
 }
 
 facet_active_host() {
@@ -4134,6 +4095,13 @@ unmount_fstype() {
 ## MountConf setup
 
 stopall() {
+    # make sure we are using the primary server, so test-framework will
+    # be able to clean up properly.
+    activemds=`facet_active mds1`
+    if [ $activemds != "mds1" ]; then
+        fail mds1
+    fi
+
     local clients=$CLIENTS
     [ -z $clients ] && clients=$(hostname)
 
-- 
1.8.3.1