LU-2012 tests: disable replay-dual test_14b

[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..f9bbbc0 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
+# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
+
 set -e
 
-# bug number:  10124
-ALWAYS_EXCEPT="15c   $REPLAY_DUAL_EXCEPT"
+# bug number:  LU-2012 10124
+ALWAYS_EXCEPT="14b     15c   $REPLAY_DUAL_EXCEPT"
 
 SAVE_PWD=$PWD
 PTLDEBUG=${PTLDEBUG:--1}
@@ -10,6 +13,7 @@ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 MOUNT_2=${MOUNT_2:-"yes"}
+export MULTIOP=${MULTIOP:-multiop}
 . $LUSTRE/tests/test-framework.sh
 
 init_test_env $@
@@ -64,9 +68,18 @@ run_test 0a "expired recovery with lost client"
 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
+       complete $SECONDS
+       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
 
@@ -254,7 +267,7 @@ test_12() {
     multiop_bg_pause $DIR/$tfile mo_c || return 1
     MULTIPID=$!
 
-#define OBD_FAIL_LDLM_ENQUEUE            0x302
+#define OBD_FAIL_LDLM_ENQUEUE_NET                      0x302
     do_facet $SINGLEMDS lctl set_param fail_loc=0x80000302
     facet_failover $SINGLEMDS
     do_facet $SINGLEMDS lctl set_param fail_loc=0
@@ -297,36 +310,39 @@ run_test 13 "close resend timeout"
 # as test_15a
 
 test_14b() {
-    wait_mds_ost_sync
-    wait_destroy_complete
-    BEFOREUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'`
-    mkdir -p $MOUNT1/$tdir
-    $SETSTRIPE -i 0 $MOUNT1/$tdir
-    replay_barrier $SINGLEMDS
-    createmany -o $MOUNT1/$tdir/$tfile- 5
+       wait_mds_ost_sync
+       wait_delete_completed
 
-    $SETSTRIPE -i 0 $MOUNT2/f14b-3
-    echo "data" > $MOUNT2/f14b-3
-    createmany -o $MOUNT1/$tdir/$tfile-3- 5
-    umount $MOUNT2
+       local BEFOREUSED=$(df -P $DIR | tail -1 | awk '{ print $3 }')
 
-    fail $SINGLEMDS
-    wait_recovery_complete $SINGLEMDS || error "MDS recovery not done"
+       mkdir -p $MOUNT1/$tdir
+       $SETSTRIPE -i 0 $MOUNT1/$tdir
+       replay_barrier $SINGLEMDS
+       createmany -o $MOUNT1/$tdir/$tfile- 5
 
-    # first 25 files should have been replayed
-    unlinkmany $MOUNT1/$tdir/$tfile- 5 || return 2
-    unlinkmany $MOUNT1/$tdir/$tfile-3- 5 || return 3
+       $SETSTRIPE -i 0 $MOUNT2/$tfile-2
+       dd if=/dev/zero of=$MOUNT2/$tfile-2 bs=1M count=5
+       createmany -o $MOUNT1/$tdir/$tfile-3- 5
+       umount $MOUNT2
 
-    zconf_mount `hostname` $MOUNT2 || error "mount $MOUNT2 fail"
+       fail $SINGLEMDS
+       wait_recovery_complete $SINGLEMDS || error "MDS recovery not done"
 
-    wait_mds_ost_sync || return 4
-    wait_destroy_complete || return 5
+       # first set of files should have been replayed
+       unlinkmany $MOUNT1/$tdir/$tfile- 5 || error "first unlinks failed"
+       unlinkmany $MOUNT1/$tdir/$tfile-3- 5 || error "second unlinks failed"
 
-    AFTERUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'`
-    log "before $BEFOREUSED, after $AFTERUSED"
-    [ $AFTERUSED -ne $BEFOREUSED ] && \
-        error "after $AFTERUSED > before $BEFOREUSED" && return 4
-    return 0
+       zconf_mount $HOSTNAME $MOUNT2 || error "mount $MOUNT2 failed"
+       [ -f $MOUNT2/$tfile-2 ] && error "$MOUNT2/$tfile-2 exists!"
+
+       wait_mds_ost_sync || error "wait_mds_ost_sync failed"
+       wait_delete_completed || error "wait_delete_complete failed"
+
+       local AFTERUSED=$(df -P $DIR | tail -1 | awk '{ print $3 }')
+       log "before $BEFOREUSED, after $AFTERUSED"
+       # leave some margin for some files/dirs to be modified (OI, llog, etc)
+       [ $AFTERUSED -gt $((BEFOREUSED + 128)) ] &&
+               error "after $AFTERUSED > before $BEFOREUSED" || true
 }
 run_test 14b "delete ost orphans if gap occured in objids due to VBR"
 
@@ -413,7 +429,7 @@ test_18() { # bug 3822 - evicting client with enqueued lock
     NOW=`date +%s`
     do_facet $SINGLEMDS lctl set_param fail_loc=0x8000030b  # hold enqueue
     sleep 1
-#define OBD_FAIL_LDLM_BL_CALLBACK        0x305
+#define OBD_FAIL_LDLM_BL_CALLBACK_NET                  0x305
     do_facet client lctl set_param fail_loc=0x80000305  # drop cb, evict
     cancel_lru_locks mdc
     usleep 500 # wait to ensure first client is one that will be evicted
@@ -563,7 +579,7 @@ run_test 21b "commit on sharing, two clients"
 
 # end commit on sharing tests 
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 SLEEP=$((`date +%s` - $NOW))
 [ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP
 [ "$MOUNTED2" = yes ] && zconf_umount $HOSTNAME $MOUNT2 || true