b=2945

It's possible for df to fail here, instead of returning a smaller fs
size. In either case, it means (most likely) we've been evicted.

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 8e7dfb8..9108569 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -832,11 +832,15 @@ test_42() {
     
     # osc is evicted, fs is smaller
     blocks_after=`df $MOUNT | tail -1 | awk '{ print $1 }'`
-    [ $blocks_after -lt $blocks ] || return 1
+    if [ "$blocks_after" = "Filesystem" ]; then
+       echo "df failed, assuming caused by OST failout"
+    else
+        [ $blocks_after -lt $blocks ] || return 1
+    fi
     echo wait for MDS to timeout and recover
     sleep $((TIMEOUT * 2))
     unlinkmany $DIR/$tfile-%d 400 400
-    $CHECKSTAT -t file $DIR/$tfile-* && return 1 || true
+    $CHECKSTAT -t file $DIR/$tfile-* && return 2 || true
 }
 run_test 42 "recovery after ost failure"