b=16551 (att 19784)

o=Adilger
i=grev
skip replay/recovery tests if remote MDS/OSS with nodsh

b=16551 (att 19835)
i=Nathan
do skip_rem[mds|ost] check only if test suit is run; fail acc-sm if
tests suits were skipped due to nodsh

b=17326
i=Alexey.Lyashkov
remove now-useless remount/reconfig for liblustre;
always add accept=all for lnet module

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index ba92229..ba6bc91 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -11,6 +11,8 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+
 # also long tests: 19, 21a, 21e, 21f, 23, 27
 #                                   1  2.5  2.5    4    4          (min)"
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="17  26a  26b    50   51     57"
@@ -23,6 +25,7 @@ SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 
 cleanup_and_setup_lustre
+
 assert_DIR
 rm -rf $DIR/[df][0-9]*
 
@@ -94,6 +97,8 @@ dd if=/dev/urandom of=$SAMPLE_FILE bs=1M count=4
 
 #bug 1420
 test_9() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     pause_bulk "cp /etc/profile $DIR/$tfile"       || return 1
     do_facet client "cp $SAMPLE_FILE $DIR/${tfile}.2"  || return 2
     do_facet client "sync"
@@ -184,6 +189,8 @@ start_read_ahead() {
 }
 
 test_16() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     do_facet client cp $SAMPLE_FILE $DIR
     sync
     stop_read_ahead
@@ -204,6 +211,8 @@ run_test 16 "timeout bulk put, don't evict client (2732)"
 test_17() {
     local at_max_saved=0
 
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     # With adaptive timeouts, bulk_get won't expire until adaptive_timeout_max
     if at_is_valid && at_is_enabled; then
         at_max_saved=$(at_max_get ost1)
@@ -258,6 +267,8 @@ test_18a() {
 run_test 18a "manual ost invalidate clears page cache immediately"
 
 test_18b() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     do_facet client mkdir -p $DIR/$tdir
     f=$DIR/$tdir/$tfile
     f2=$DIR/$tdir/${tfile}-2
@@ -286,6 +297,8 @@ test_18b() {
 run_test 18b "eviction and reconnect clears page cache (2766)"
 
 test_18c() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     do_facet client mkdir -p $DIR/$tdir
     f=$DIR/$tdir/$tfile
     f2=$DIR/$tdir/${tfile}-2
@@ -343,6 +356,8 @@ test_19b() {
 run_test 19b "test expired_lock_main on ost (2867)"
 
 test_20a() {   # bug 2983 - ldlm_handle_enqueue cleanup
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        mkdir -p $DIR/$tdir
        lfs setstripe $DIR/$tdir/${tfile} -i 0 -c 1
        multiop_bg_pause $DIR/$tdir/${tfile} O_wc || return 1
@@ -358,6 +373,8 @@ test_20a() {        # bug 2983 - ldlm_handle_enqueue cleanup
 run_test 20a "ldlm_handle_enqueue error (should return error)" 
 
 test_20b() {   # bug 2986 - ldlm_handle_enqueue error during open
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        mkdir -p $DIR/$tdir
        lfs setstripe $DIR/$tdir/${tfile} -i 0 -c 1
        cancel_lru_locks osc
@@ -597,6 +614,8 @@ test_23() { #b=4561
 run_test 23 "client hang when close a file after mds crash"
 
 test_24() { # bug 11710 details correct fsync() behavior
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        mkdir -p $DIR/$tdir
        lfs setstripe $DIR/$tdir -s 0 -i 0 -c 1
        cancel_lru_locks osc
@@ -615,6 +634,7 @@ run_test 24 "fsync error (should return error)"
 test_26a() {      # was test_26 bug 5921 - evict dead exports by pinger
 # this test can only run from a client on a separate node.
        remote_ost || { skip "local OST" && return 0; }
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
        remote_mds || { skip "local MDS" && return 0; }
        OST_FILE=obdfilter.${ost1_svc}.num_exports
         OST_EXP="`do_facet ost1 lctl get_param -n $OST_FILE`"
@@ -637,6 +657,8 @@ test_26a() {      # was test_26 bug 5921 - evict dead exports by pinger
 run_test 26a "evict dead exports"
 
 test_26b() {      # bug 10140 - evict dead exports by pinger
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        client_df
        zconf_mount `hostname` $MOUNT2 || error "Failed to mount $MOUNT2"
        MDS_FILE=mds.${mds_svc}.num_exports
@@ -661,7 +683,6 @@ test_26b() {      # bug 10140 - evict dead exports by pinger
 run_test 26b "evict dead exports"
 
 test_27() {
-       remote_mds && { skip "remote MDS" && return 0; }
        mkdir -p $DIR/$tdir
        writemany -q -a $DIR/$tdir/$tfile 0 5 &
        CLIENT_PID=$!
@@ -776,6 +797,8 @@ test_52_guts() {
 }
 
 test_52() {
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        mkdir -p $DIR/$tdir
        test_52_guts 1
        rc=$?
@@ -816,7 +839,7 @@ run_test 54 "back in time"
 
 # bug 11330 - liblustre application death during I/O locks up OST
 test_55() {
-       remote_ost && { skip "remote OST" && return 0; }
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
 
        mkdir -p $DIR/$tdir