From 2f8c65486df47bfe38068345603172d90c0861e6 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Wed, 13 Jul 2005 22:08:59 +0000
Subject: [PATCH] conf-sanity: don't start/stop lsvcgssd/lgssd frequently.

---
 lustre/tests/conf-sanity.sh | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f9e58ea..ffd5b30 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -45,13 +45,11 @@ gen_second_config() {
 start_mds() {
 	echo "start mds1 service on `facet_active_host mds1`"
 	start mds1 --reformat $MDSLCONFARGS  || return 94
-	start_lsvcgssd || return 501
 }
 
 stop_mds() {
 	echo "stop mds1 service on `facet_active_host mds1`"
 	stop mds1 $@ || return 97
-	stop_lsvcgssd
 }
 
 start_ost() {
@@ -66,7 +64,6 @@ stop_ost() {
 
 mount_client() {
 	local MOUNTPATH=$1
-	start_lgssd || return 502
 	echo "mount lustre on ${MOUNTPATH}....."
 	zconf_mount `hostname`  $MOUNTPATH  || return 96
 }
@@ -75,13 +72,11 @@ umount_client() {
 	local MOUNTPATH=$1
 	echo "umount lustre on ${MOUNTPATH}....."
 	zconf_umount `hostname`  $MOUNTPATH || return 97
-	stop_lgssd
 }
 
 manual_umount_client(){
 	echo "manual umount lustre on ${MOUNTPATH}...."
 	do_facet  client "umount $MOUNT"
-	stop_lgssd
 }
 
 setup() {
@@ -122,7 +117,8 @@ build_test_filter
 
 gen_config
 start_krb5_kdc || exit 1
-
+start_lsvcgssd || return 2
+start_lgssd || return 3
 
 test_0() {
 	start_ost
@@ -206,7 +202,6 @@ test_5() {
 	kill -TERM $UMOUNT_PID
 	echo "waiting for umount to finish"
 	wait $UMOUNT_PID
-	stop_lgssd
 
 	# cleanup client modules
 	$LCONF --force --cleanup --nosetup --node client_facet $XMLCONFIG > /dev/null
@@ -232,12 +227,10 @@ test_5b() {
 
 	[ -d $MOUNT ] || mkdir -p $MOUNT
 	$LCONF --nosetup --node client_facet $XMLCONFIG > /dev/null
-	start_lgssd || return 1
 	llmount -o nettype=$NETTYPE $mds_HOST://mds_svc/client_facet $MOUNT  && exit 2
 
 	# cleanup client modules
 	$LCONF --cleanup --nosetup --node client_facet $XMLCONFIG > /dev/null
-	stop_lgssd
 	
 	# stop_mds is a no-op here, and should not fail
 	stop_mds || return 3
@@ -255,12 +248,10 @@ test_5c() {
 
 	[ -d $MOUNT ] || mkdir -p $MOUNT
 	$LCONF --nosetup --node client_facet $XMLCONFIG > /dev/null
-	start_lgssd || return 1
 	llmount -o nettype=$NETTYPE $mds_HOST://wrong_mds_svc/client_facet $MOUNT  && return 2
 
 	# cleanup client modules
 	$LCONF --cleanup --nosetup --node client_facet $XMLCONFIG > /dev/null
-	stop_lgssd
 	
 	stop_mds || return 3
 	stop_ost || return 4
@@ -278,13 +269,11 @@ test_5d() {
 
        [ -d $MOUNT ] || mkdir -p $MOUNT
        $LCONF --nosetup --node client_facet $XMLCONFIG > /dev/null
-       start_lgssd || return 1
        llmount -o nettype=$NETTYPE $mds_HOST://mds1_svc/client_facet $MOUNT  || return 1
 
        umount $MOUNT || return 2
        # cleanup client modules
        $LCONF --cleanup --nosetup --node client_facet $XMLCONFIG > /dev/null
-       stop_lgssd
 
        stop_mds || return 3
 
@@ -782,4 +771,7 @@ test_18() {
 }
 run_test 18 "check lconf creates large journals"
 
+stop_lgssd
+stop_lsvcgssd
+
 equals_msg "Done"
-- 
1.8.3.1