Branch b1_4

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

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 129bb8c..d7480b6 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -66,7 +66,7 @@ fi
 
 if [ "$ONLY" == "cleanup" ]; then
     sysctl -w portals.debug=0 || true
-    cleanup
+    FORCE=--force cleanup
     exit
 fi
 
@@ -387,8 +387,9 @@ test_24() { # bug 2248 - eviction fails writeback but app doesn't see it
        kill -USR1 $MULTI_PID
        wait $MULTI_PID
        rc=$?
-       [ $rc -eq 0 ] && error "multiop didn't fail fsync: rc $rc" || true
        sysctl -w lustre.fail_loc=0x0
+       client_reconnect
+       [ $rc -eq 0 ] && error "multiop didn't fail fsync: rc $rc" || true
 }
 run_test 24 "fsync error (should return error)" 
 
@@ -472,8 +473,9 @@ test_25c() {
        sleep 30
        test_25c_guts
        rc=$?
+       client_reconnect
        return $rc
 }
 run_test 25c "failover OST under load"
 
-$CLEANUP
+FORCE=--force $CLEANUP