From 396bd5b5cc30bc399e47a0fce3518769b8343f83 Mon Sep 17 00:00:00 2001
From: tappro <tappro>
Date: Thu, 28 Feb 2008 09:26:15 +0000
Subject: [PATCH]  b=12882  i=grev  Use correct proc names in tests

---
 lustre/tests/conf-sanity.sh    | 2 +-
 lustre/tests/sanity.sh         | 2 +-
 lustre/tests/test-framework.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3425e1d..219843d 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1112,7 +1112,7 @@ test_32a() {
 	$TUNEFS $TMP/$tdir/mds || error "tunefs failed"
 	# nids are wrong, so client wont work, but server should start
         start mds $TMP/$tdir/mds "-o loop,exclude=lustre-OST0000" || return 3
-        local UUID=$(cat $LPROC/mds/lustre-MDT0000/uuid)
+        local UUID=$(cat $LPROC/mdt/lustre-MDT0000/uuid)
 	echo MDS uuid $UUID
 	[ "$UUID" == "mdsA_UUID" ] || error "UUID is wrong: $UUID" 
 
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 83ef56a..c15eddb 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2605,7 +2605,7 @@ test_57b() {
 	$GETSTRIPE $FILE1 2>&1 | grep -q "no stripe" || error "$FILE1 has an EA"
 	$GETSTRIPE $FILEN 2>&1 | grep -q "no stripe" || error "$FILEN has an EA"
 
-	MDSFREE="`cat $LPROC/mds/*/kbytesfree 2> /dev/null`"
+	MDSFREE="`cat $LPROC/osd/*MDT*/kbytesfree 2> /dev/null`"
 	MDCFREE="`cat $LPROC/mdc/*/kbytesfree | head -n 1`"
 	echo "opening files to create objects/EAs"
 	for FILE in `seq -f $DIR/d57b/f%g 1 $FILECOUNT`; do
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1d8e6fb..7ecd12b 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -563,7 +563,7 @@ wait_mds_recovery_done () {
     MAX=$(( timeout * 4 ))
     WAIT=0
     while [ $WAIT -lt $MAX ]; do
-        STATUS=`do_facet mds grep status /proc/fs/lustre/mdt/*-MDT*/recovery_status`
+        STATUS=`do_facet $SINGLEMDS grep status /proc/fs/lustre/mdt/*-MDT*/recovery_status`
         echo $STATUS | grep COMPLETE && return 0
         sleep 5
         WAIT=$((WAIT + 5))
@@ -1341,8 +1341,8 @@ pass() {
 }
 
 check_mds() {
-    FFREE=`cat /proc/fs/lustre/mds/*/filesfree`
-    FTOTAL=`cat /proc/fs/lustre/mds/*/filestotal`
+    FFREE=`cat /proc/fs/lustre/osd/*MDT*/filesfree`
+    FTOTAL=`cat /proc/fs/lustre/osd/*MDT*/filestotal`
     [ $FFREE -ge $FTOTAL ] && error "files free $FFREE > total $FTOTAL" || true
 }
 
-- 
1.8.3.1