LU-1999 tests: check LW client eviction in logs

[fs/lustre-release.git] / lustre / tests / recovery-small.sh

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 9936a45..45cf76e 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -3,7 +3,7 @@
 set -e
 
 #         bug  5494 5493
-ALWAYS_EXCEPT="24   52 $RECOVERY_SMALL_EXCEPT"
+ALWAYS_EXCEPT="24   52    $RECOVERY_SMALL_EXCEPT"
 
 export MULTIOP=${MULTIOP:-multiop}
 PTLDEBUG=${PTLDEBUG:--1}
@@ -1059,7 +1059,10 @@ test_58() { # bug 11546
         lctl set_param fail_loc=0
         drop_bl_callback rm -f $DIR/$tfile
         wait $pid
-        do_facet client "df $DIR"
+        # the first 'df' could tigger the eviction caused by
+        # 'drop_bl_callback', and it's normal case.
+        # but the next 'df' should return successfully.
+        do_facet client "df $DIR" || do_facet client "df $DIR"
 }
 run_test 58 "Eviction in the middle of open RPC reply processing"
 
@@ -1515,8 +1518,14 @@ test_106() { # LU-1789
        facet_failover $SINGLEMDS
 
        # lightweight connection must be evicted
-       wait_client_evicted $SINGLEMDS $MDS_NEXP $((TIMEOUT * 3)) || \
-               error "lightweight client not evicted by mds"
+       touch -c $DIR2/$tfile || true
+       evicted=`dmesg | awk '/test 106/ {start = 1;}
+                             /This client was evicted by .*MDT0000/ {
+                                     if (start) {
+                                             print;
+                                     }
+                             }'`
+       [ -z "$evicted" ] && error "lightweight client not evicted by mds"
 
        # and all operations performed by lightweight client should be
        # synchronous, so the file created before mds restart should be there