diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index b8983326cd72290132fe8bd8bd55b93c9c374d9e..5e9aae07b9a38cf415ba829b4ece73d2050d9b22 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -3639,8 +3639,9 @@ test_101() { $READS -f $DIR/$tfile -s$((cache_limit * 3192 * 1024)) -b65536 -C -n$nreads -t 180 discard=0 - for s in `lctl get_param -n llite.*.read_ahead_stats | get_named_value 'read but discarded'`; do - discard=$(($discard + $s)) + for s in `lctl get_param -n llite.*.read_ahead_stats | \ + get_named_value 'read but discarded' | cut -d" " -f1`; do + discard=$(($discard + $s)) done cleanup_101 @@ -3686,10 +3687,11 @@ ra_check_101() { local RA_INC=1048576 local STRIDE_LENGTH=$((STRIPE_SIZE/READ_SIZE)) local FILE_LENGTH=$((64*100)) - local discard_limit=$(((((((STRIDE_LENGTH - 1))*3)/(STRIDE_LENGTH*OSTCOUNT))* \ - (STRIDE_LENGTH*OSTCOUNT - STRIDE_LENGTH)))) - DISCARD=`$LCTL get_param -n llite.*.read_ahead_stats | \ - get_named_value 'read but discarded' | calc_total` + local discard_limit=$((((STRIDE_LENGTH - 1)*3/(STRIDE_LENGTH*OSTCOUNT))* \ + (STRIDE_LENGTH*OSTCOUNT - STRIDE_LENGTH))) + DISCARD=`$LCTL get_param -n llite.*.read_ahead_stats | \ + get_named_value 'read but discarded' | \ + cut -d" " -f1 | calc_total` if [ $DISCARD -gt $discard_limit ]; then lctl get_param llite.*.read_ahead_stats