From 858e1420fc221bfa37a62527583ef83b11422b32 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 4 Aug 2004 20:34:09 +0000
Subject: [PATCH] Land b1_4_smallfix onto b1_4 (20040804_1301) - use transno
 after validating reply (3892) - use different name for 2nd ptlrpcd thread
 (3887) - fix mds_postrecov to initialize import for llog ctxt (3121) - be
 sure to send a reply for a CANCEL rpc with bad export (3863) - don't allow
 enqueue to complete on a destroyed export (3822) - down write_lock before
 checking llog header bitmap (3825) - recover from lock replay timeout (3764)
 - replace some LBUG about llog ops with error handling (3841) - add libwrap
 support for the TCP acceptor (3996) - install man pages and include them in
 rpms (3100) - add new init script for (un)mounting lustre filesystems (2593)
 - run chkconfig in %post for init scripts (3701) - drop scimac NAL
 (unmaintained)

---
 lustre/tests/lfscktest.sh        | 16 ++++++++++------
 lustre/tests/lfscktest_config.sh | 23 +----------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/lustre/tests/lfscktest.sh b/lustre/tests/lfscktest.sh
index 4c9fed0..7e2fad1 100755
--- a/lustre/tests/lfscktest.sh
+++ b/lustre/tests/lfscktest.sh
@@ -11,7 +11,9 @@ mkdir -p $OST_MOUNTPT
 mkdir -p $MDS_MOUNTPT
 mkdir -p $TEST_DIR
 
-export PATH=$E2FSCK_PATH/e2fsck:$PATH
+export PATH=$LFSCK_PATH/e2fsck:`dirname $0`:`dirname $0`/../utils:$PATH
+
+sh llmount.sh || exit 1
 
 # Create some files on the filesystem
 for i in `seq 0 3`; do
@@ -67,13 +69,13 @@ for i in `seq 20 39`; do
 	MDS_FILES="$MDS_FILES ${TESTNAME}/${file_name}.$i"
 done
 
-$LCONF --cleanup ${CONFIGXML} || exit 1
+sh llmountcleanup.sh || exit 1
 
 # Remove objects associated with files
 echo "removing objects: $OST_TEST_FILE_OBJIDS"
 for i in $OST_TEST_FILE_OBJIDS; do
 	z=`expr $i % 32`
-	$DEBUGFS -w -R "rm O/0/d$z/$i" "$OSTDEV" || exit 1
+	debugfs -w -R "rm O/0/d$z/$i" "$OSTDEV" || exit 1
 done
 
 mount "-o" loop $MDSDEV $MDS_MOUNTPT
@@ -86,7 +88,7 @@ done
 #Create EAs on files so objects are referenced twice from different mds files
 for i in `seq 40 59`; do
 	touch $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.bad.$i
-	${GPATH}/copy_attr $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.$i $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.bad.$i || (umount $MDS_MOUNTPT && exit 1) 
+	copy_attr $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.$i $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.bad.$i || (umount $MDS_MOUNTPT && exit 1) 
 	i=`expr $i + 1`
 done
 	umount $MDS_MOUNTPT 
@@ -113,11 +115,13 @@ while [ $i -lt $NUM_OSTS ]; do
 	i=`expr $i + 1`
 done
 
-#Mount filesystem
-${LCONF} ${CONFIGXML}  || exit 1
+#Remount filesystem
+sh llrmount.sh  || exit 1
 
 lfsck -l --mdsdb $GPATH/mdsdb --ostdb ${OSTDB_LIST} ${MOUNT} || exit 1  
 
 #Cleanup 
 rm $GPATH/mdsdb
 rm $GPATH/ostdb-*
+
+sh llmountcleanup.sh || exit 1
diff --git a/lustre/tests/lfscktest_config.sh b/lustre/tests/lfscktest_config.sh
index 986656c..6bae2bc 100644
--- a/lustre/tests/lfscktest_config.sh
+++ b/lustre/tests/lfscktest_config.sh
@@ -1,31 +1,10 @@
 export TESTNAME="lfscktest"
 export TESTDESC="Test of lfsck functionality"
 
-export LUSTRE=${LUSTRE:-"../.."}
-export LCONF=${LCONF:-"$LUSTRE/utils/lconf"}
-export LMC=${LMC:-"$LUSTRE/utils/lmc"}
-export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
-export LFIND=${LFIND:-"$LUSTRE/utils/lfind"}
-export E2FSCK_PATH=${E2FSCK_PATH:-"/usr/src/e2fsprogs-1.34"}
+export LFSCK_PATH=${E2FSCK_PATH:-"/usr/src/e2fsprogs-1.34"}
 export TMP=${TMP:-"/tmp"}
-export CONFIG=${CONFIG:-"./lfsck_config.sh"}
 export LOG=${LOG:-"${TMP}/lfscktest.log"}
-export CONFIGXML=${CONFIGXML:-"./lfsck_config.xml"}
 export LUSTRE_TAG=${LUSTRE_TAG:="HEAD"}
-export MACHINENAME=`hostname | sed -e 's/[0-9]\+//'`
-export TESTGROUP=${TESTGROUP:-"unspecified"}
-export CONFIGDESC=${CONFIGDESC:-"local"}
-export TESTARCH=${TESTARCH:-`uname -m`}
-export NETTYPE=${NETTYPE:-"tcp"}
-export MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-export MDSNODES=${MDSNODES:-`hostname`}
-export OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
-export OSTNODES=${OSTNODES:-`hostname`}
-export CLIENTNODES=${CLIENTNODES:-`hostname`}
-export RECIPIENTS=${RECIPIENTS:-"liam.kelleher@hp.com"}
-export SENDER=${SENDER:-"liam.kelleher@hp.com"}
-export NUM_OSTS=${NUM_OSTS:-5}
-export DEBUGFS=${DEBUGFS:-"debugfs"}
 
 export GPATH=`pwd`
 export OST_UUID="OST_localhost_2_UUID"
-- 
1.8.3.1