LU-482 tests: cleanup clients/OSTs after MDS error

[fs/lustre-release.git] / lustre / tests / replay-dual.sh

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 2ac97fc..9afcb36 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
+
 set -e
 
 # bug number:  10124
@@ -65,8 +68,17 @@ if [ -f "$LU482_FAILED" ]; then
        log "Found check file $LU482_FAILED, aborting test script"
        rm -vf "$LU482_FAILED"
        complete $(basename $0) $SECONDS
-       [ "$MOUNTED2" = yes ] && zconf_umount $HOSTNAME $MOUNT2 || true
-       check_and_cleanup_lustre
+       do_nodes $CLIENTS umount -f $MOUNT2 || true
+       do_nodes $CLIENTS umount -f $MOUNT || true
+       # copied from stopall, but avoid the MDS recovery
+    for num in `seq $OSTCOUNT`; do
+        stop ost$num -f
+        rm -f $TMP/ost${num}active
+    done
+    if ! combined_mgs_mds ; then
+        stop mgs
+    fi
+
        exit_status
 fi