From a74fa1bb96bd3db47e1a1d6acdf565b768ab5d5c Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 17 Feb 2006 22:53:29 +0000
Subject: [PATCH] Branch b_release_1_4_6 Fix conf-sanity.sh test 5d failure on
 lester (elan). The client mount was not using the MDS NID, only the hostname.
 b=9788

---
 lustre/tests/conf-sanity.sh    | 11 +++++------
 lustre/tests/test-framework.sh |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3815714..660c4fc 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -52,6 +52,7 @@ start_mds() {
 	echo "start mds service on `facet_active_host mds`"
 	start mds --reformat $MDSLCONFARGS  || return 94
 }
+
 stop_mds() {
 	echo "stop mds service on `facet_active_host mds`"
 	stop mds $@  || return 97
@@ -266,11 +267,9 @@ test_5d() {
 
 	[ -d $MOUNT ] || mkdir -p $MOUNT
 	$LCONF --nosetup --node client_facet $XMLCONFIG > /dev/null
-	llmount -o nettype=$NETTYPE,$MOUNTOPT $mds_HOST://mds_svc/client_facet $MOUNT  || return 1 
+	llmount -o nettype=$NETTYPE,$MOUNTOPT `facet_nid mds`://mds_svc/client_facet $MOUNT  || return 1 
 
-	umount $MOUNT || return 2
-	# cleanup client modules
-	$LCONF --cleanup --nosetup --node client_facet $XMLCONFIG > /dev/null
+	umount_client $MOUNT || return 2
 	
 	stop_mds || return 3
 
@@ -619,7 +618,7 @@ test_15() {
 	# load llite module on the client if it isn't in /lib/modules
 	do_node `hostname` lconf --nosetup --node client_facet $XMLCONFIG
 	do_node `hostname` mount -t lustre -o nettype=$NETTYPE,$MOUNTOPT \
-		`facet_active_host mds`:/mds_svc/client_facet $MOUNT ||return $?
+		`facet_nid mds`:/mds_svc/client_facet $MOUNT ||return $?
 	echo "mount lustre on $MOUNT with $MOUNTLUSTRE: success"
 	[ -d /r ] && $LCTL modules > /r/tmp/ogdb-`hostname`
 	check_mount || return 41
@@ -628,7 +627,7 @@ test_15() {
 	[ -f "$MOUNTLUSTRE" ] && rm -f $MOUNTLUSTRE
 	echo "mount lustre on ${MOUNT} without $MOUNTLUSTRE....."
 	do_node `hostname` mount -t lustre -o nettype=$NETTYPE,$MOUNTOPT \
-		`facet_active_host mds`:/mds_svc/client_facet $MOUNT &&return $?
+		`facet_nid mds`:/mds_svc/client_facet $MOUNT &&return $?
 	echo "mount lustre on $MOUNT without $MOUNTLUSTRE failed as expected"
 	cleanup || return $?
 	cleanup_15
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1f520d1..e4c18ad 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -279,12 +279,12 @@ facet_nid() {
    facet=$1
    HOST=`facet_host $facet`
    if [ -z "$HOST" ]; then
-	echo "The env variable ${facet}_HOST must be set."
-	exit 1
+	    echo "The env variable ${facet}_HOST must be set."
+	    exit 1
    fi
    if [ -z "$NETTYPE" ]; then
-	echo "The env variable NETTYPE must be set."
-	exit 1
+	    echo "The env variable NETTYPE must be set."
+	    exit 1
    fi
    echo `h2$NETTYPE $HOST`
 }
-- 
1.8.3.1