b=16548

i=Adilger
make oos.sh to be verbose; get rid of proc

lustre/tests/oos.sh

@@ -3,13 +3,17 @@
 set -e
 #set -vx
 
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+
 export PATH=`dirname $0`/../utils:$PATH
 LFS=${LFS:-lfs}
+LCTL=${LCTL:-lctl}
 MOUNT=${MOUNT:-$1}
 MOUNT=${MOUNT:-/mnt/lustre}
 OOS=$MOUNT/oosfile
 TMP=${TMP:-/tmp}
-LOG=$TMP/ooslog
+LOG=$TMP/$(basename $0 .sh).log
 
 SUCCESS=1
 
@@ -17,24 +21,32 @@ rm -f $OOS $LOG
 
 sync; sleep 1; sync	# to ensure we get up-to-date statfs info
 
-#echo -1 > /proc/sys/lnet/debug
-#echo 0x40a8 > /proc/sys/lnet/subsystem_debug
-#lctl clear
-#lctl debug_daemon start /r/tmp/debug 1024
+#$LCTL set_param -n debug=-1
+#$LCTL set_param -n subsystem_debug=0x40a8
+
+#$LCTL clear
+#$LCTL debug_daemon start /r/tmp/debug 1024
 
-STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -n 1`
-ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -n 1`
+STRIPECOUNT=`$LCTL get_param -n lov.*.activeobd | head -n 1`
+ORIGFREE=`$LCTL get_param -n llite.*.kbytesavail | head -n 1`
 MAXFREE=${MAXFREE:-$((400000 * $STRIPECOUNT))}
+echo STRIPECOUNT=$STRIPECOUNT ORIGFREE=$ORIGFREE MAXFREE=$MAXFREE
 if [ $ORIGFREE -gt $MAXFREE ]; then
-	echo "skipping out-of-space test on $OSC"
-	echo "reports ${ORIGFREE}kB free, more than MAXFREE ${MAXFREE}kB"
-	echo "increase $MAXFREE (or reduce test fs size) to proceed"
+	skip "$0: ${ORIGFREE}kB free gt MAXFREE ${MAXFREE}kB, increase $MAXFREE (or reduce test fs size) to proceed"
 	exit 0
 fi
 
 export LANG=C LC_LANG=C # for "No space left on device" message
 
-[ -f $LOG ] && echo "ERROR: log file wasn't removed?" && exit 1
+[ -f $LOG ] && error "log file wasn't removed?"
+
+echo BEFORE dd started
+for OSC in `$LCTL get_param -N osc.*-osc-*.kbytesavail | cut -d"." -f1-2`; do
+	AVAIL=`$LCTL get_param -n $OSC.kbytesavail`
+	GRANT=$((`$LCTL get_param -n $OSC.cur_grant_bytes` / 1024))
+	echo -n "$(echo $OSC | cut -d"." -f2) avl=$AVAIL grnt=$GRANT diff=$(($AVAIL - $GRANT))"
+	echo " "
+done
 
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
 $LFS setstripe $OOS -c $STRIPECOUNT
@@ -43,6 +55,8 @@ if dd if=/dev/zero of=$OOS count=$(($ORIGFREE + 100)) bs=1k 2> $LOG; then
 	SUCCESS=0
 fi
 
+[ ! -s "$LOG" ] && error "LOG file is empty!"
+
 if [ "`grep -c 'No space left on device' $LOG`" -ne 1 ]; then
 	echo "ERROR: dd not return ENOSPC"
 	sed "s/^/LOG: /" $LOG
@@ -52,17 +66,19 @@ fi
 # flush cache to OST(s) so avail numbers are correct
 sync; sleep 1 ; sync
 
-for OSC in /proc/fs/lustre/osc/*-osc-*; do
-	AVAIL=`cat $OSC/kbytesavail`
-	GRANT=$((`cat $OSC/cur_grant_bytes` / 1024))
-	echo -n "$(basename $OSC) avl=$AVAIL grnt=$GRANT diff=$(($AVAIL - $GRANT))"
+echo AFTER dd
+for OSC in `$LCTL get_param -N osc.*-osc-*.kbytesavail | cut -d"." -f1-2`; do
+	AVAIL=`$LCTL get_param -n $OSC.kbytesavail`
+	GRANT=$((`$LCTL get_param -n $OSC.cur_grant_bytes` / 1024))
+	echo -n "$(echo $OSC | cut -d"." -f2) avl=$AVAIL grnt=$GRANT diff=$(($AVAIL - $GRANT))"
 	[ $(($AVAIL - $GRANT)) -lt 400 ] && OSCFULL=full && echo -n " FULL"
 	echo " "
 done
 
 if [ -z "$OSCFULL" ]; then
 	echo "no OSTs are close to full"
-	grep "[0-9]" /proc/fs/lustre/osc/*-osc-*/{kbytesavail,cur*}
+	$LCTL get_param "osc.*-osc-*.kbytesavail"
+	$LCTL get_param "osc.*-osc-*.cur*"
 	SUCCESS=0
 fi
 
@@ -77,8 +93,10 @@ elif [ "$RECORDSOUT" -ne $((FILESIZE / 1024)) ]; then
 	SUCCESS=0
 fi
 
-#lctl debug_daemon stop
+#$LCTL debug_daemon stop
 
+echo LOG file
+cat $LOG
 rm -f $OOS
 sync; sleep 1; sync