b=16551 (att 19784)

o=Adilger
i=grev
skip replay/recovery tests if remote MDS/OSS 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/recofig for liblustre;
always add accept=all to lnet module

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 6ff5710..357bce4 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -78,6 +78,18 @@ title() {
     RANTEST=${RANTEST}$*", "
 }
 
+skip_remost()
+{
+       remote_ost_nodsh && log "SKIP: $1: remote OST with nodsh" && return 0
+       return 1
+}
+
+skip_remmds()
+{
+       remote_mds_nodsh && log "SKIP: $1: remote MDS with nodsh" && return 0
+       return 1
+}
+
 for NAME in $CONFIGS; do
        export NAME MOUNT START CLEAN
        . $LUSTRE/tests/cfg/$NAME.sh
@@ -93,6 +105,8 @@ for NAME in $CONFIGS; do
 
        setup_if_needed
 
+       MSKIPPED=0
+       OSKIPPED=0
        if [ "$RUNTESTS" != "no" ]; then
                title runtests
                bash runtests
@@ -272,19 +286,15 @@ for NAME in $CONFIGS; do
                SANITYN="done"
        fi
 
-       remote_mds && log "Remote MDS, skipping LFSCK test" && LFSCK=no
-       remote_ost && log "Remote OST, skipping LFSCK test" && LFSCK=no
-
-       if [ "$LFSCK" != "no" -a -x /usr/sbin/lfsck ]; then
+       [ "$LFSCK" != "no" ] && remote_mds && log "Remote MDS, skipping LFSCK test" && LFSCK=no && MSKIPPED=1
+       [ "$LFSCK" != "no" ] && remote_ost && log "Remote OST, skipping LFSCK test" && LFSCK=no && OSKIPPED=1
+       if [ "$LFSCK" != "no" ]; then
                title lfsck
-               E2VER=`e2fsck -V 2>&1 | head -n 1 | cut -d' ' -f 2`
-               if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
-                  [ "`echo $E2VER | grep cfs`" -o \
-                       "`echo $E2VER | grep sun`" ]; then
-                               bash lfscktest.sh
+               if [ -x /usr/sbin/lfsck ]; then
+                       bash lfscktest.sh
                else
-                       e2fsck -V
-                       echo "e2fsck does not support lfsck, skipping"
+                       log "$(e2fsck -V)"
+                       log "SKIP: e2fsck does not support lfsck"
                fi
                LFSCK="done"
        fi
@@ -293,18 +303,6 @@ for NAME in $CONFIGS; do
        if [ "$LIBLUSTRE" != "no" ]; then
                title liblustre
                assert_env MGSNID MOUNT2
-               $CLEANUP
-               unload_modules
-               # Liblustre needs accept=all, noacl
-               [ -f /etc/modprobe.conf ] && MODPROBECONF=/etc/modprobe.conf
-               [ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
-
-               LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | \
-                       sed 's/^options lnet //g; s/"//g') accept=all" \
-                       MDS_MOUNT_OPTS=$(echo $MDS_MOUNT_OPTS | sed 's/^[ \t]*//;s/[ \t]*$//') \
-                       MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" \
-                       MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS/#,/-o } \
-                       $SETUP
                export LIBLUSTRE_MOUNT_POINT=$MOUNT2
                export LIBLUSTRE_MOUNT_RETRY=5
                export LIBLUSTRE_MOUNT_TARGET=$MGSNID:/$FSNAME
@@ -323,54 +321,67 @@ for NAME in $CONFIGS; do
        $CLEANUP
 done
 
+[ "$REPLAY_SINGLE" != "no" ] && skip_remmds replay-single && REPLAY_SINGLE=no && MSKIPPED=1
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
        bash replay-single.sh
        REPLAY_SINGLE="done"
 fi
 
+[ "$CONF_SANITY" != "no" ] && skip_remmds conf-sanity && CONF_SANITY=no && MSKIPPED=1
+[ "$CONF_SANITY" != "no" ] && skip_remost conf-sanity && CONF_SANITY=no && OSKIPPED=1
 if [ "$CONF_SANITY" != "no" ]; then
         title conf-sanity
         bash conf-sanity.sh
         CONF_SANITY="done"
 fi
 
+[ "$RECOVERY_SMALL" != "no" ] && skip_remmds recover-small && RECOVERY_SMALL=no && MSKIPPED=1
 if [ "$RECOVERY_SMALL" != "no" ]; then
         title recovery-small
         bash recovery-small.sh
         RECOVERY_SMALL="done"
 fi
 
+[ "$REPLAY_OST_SINGLE" != "no" ] && skip_remost replay-ost-single && REPLAY_OST_SINGLE=no && OSKIPPED=1
 if [ "$REPLAY_OST_SINGLE" != "no" ]; then
         title replay-ost-single
         bash replay-ost-single.sh
         REPLAY_OST_SINGLE="done"
 fi
 
+[ "$REPLAY_DUAL" != "no" ] && skip_remost replay-dual && REPLAY_DUAL=no && OSKIPPED=1
 if [ "$REPLAY_DUAL" != "no" ]; then
         title replay-dual
         bash replay-dual.sh
         REPLAY_DUAL="done"
 fi
 
+[ "$INSANITY" != "no" ] && skip_remmds insanity && INSANITY=no && MSKIPPED=1
+[ "$INSANITY" != "no" ] && skip_remost insanity && INSANITY=no && OSKIPPED=1
 if [ "$INSANITY" != "no" ]; then
         title insanity
         bash insanity.sh -r
         INSANITY="done"
 fi
 
+[ "$SANITY_QUOTA" != "no" ] && skip_remmds sanity-quota && SANITY_QUOTA=no && MSKIPPED=1
+[ "$SANITY_QUOTA" != "no" ] && skip_remost sanity-quota && SANITY_QUOTA=no && OSKIPPED=1
 if [ "$SANITY_QUOTA" != "no" ]; then
         title sanity-quota
         bash sanity-quota.sh
         SANITY_QUOTA="done"
 fi
 
+[ "$SANITY_SEC" != "no" ] && skip_remmds sanity-sec && SANITY_SEC=no && MSKIPPED=1
+[ "$SANITY_SEC" != "no" ] && skip_remost sanity-sec && SANITY_SEC=no && OSKIPPED=1
 if [ "$SANITY_SEC" != "no" ]; then
         title sanity-sec
         bash sanity-sec.sh
         SANITY_SEC="done"
 fi
 
+[ "$SANITY_GSS" != "no" ] && skip_remmds sanity-gss && SANITY_GSS=no && MSKIPPED=1
 if [ "$SANITY_GSS" != "no" ]; then
         title sanity-gss
         bash sanity-gss.sh
@@ -391,4 +402,6 @@ title FINISHED
 echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"
 echo "Tests ran: $RANTEST"
 print_summary
+[ "$MSKIPPED" = 1 ] && log "FAIL: remote MDS tests skipped" && RC=1
+[ "$OSKIPPED" = 1 ] && log "FAIL: remote OST tests skipped" && RC=1
 echo "$0: completed with rc $RC" && exit $RC

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index ef20e79..d6ddc29 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -37,6 +37,9 @@ MDSSIZE=40000
 OSTSIZE=40000
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 #
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="0 1 2 3 6 7 15 18 24b 25 30 31 32 33 34a "
 

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 9100d3b..2704a3e 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -35,6 +35,9 @@ assert_env mds_HOST MDS_MKFS_OPTS
 assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 assert_env LIVE_CLIENT FSNAME
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 # FAIL_CLIENTS list should not contain the LIVE_CLIENT
 FAIL_CLIENTS=$(echo " $FAIL_CLIENTS " | sed -re "s/\s+$LIVE_CLIENT\s+/ /g")
 

diff --git a/lustre/tests/lfscktest.sh b/lustre/tests/lfscktest.sh
index cc56df8..61534b6 100755 (executable)
--- a/lustre/tests/lfscktest.sh
+++ b/lustre/tests/lfscktest.sh
@@ -25,6 +25,9 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+remote_mds && skip "remote MDS" && exit 0
+remote_ost && skip "remote OST" && exit 0
+
 # if nothing mounted, don't nuke MOUNT variable needed in llmount.sh
 WAS_MOUNTED=$(mounted_lustre_filesystems | head -1)
 if [ -z "$WAS_MOUNTED" ]; then

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 40e28f7..c02fd18 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -18,6 +18,8 @@ if [ "$FAILURE_MODE" = "HARD" ] && mixed_ost_devs; then
     ALWAYS_EXCEPT="$ALWAYS_EXCEPT $CONFIG_EXCEPTIONS"
 fi
 
+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"
@@ -30,6 +32,7 @@ SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 
 cleanup_and_setup_lustre
+
 assert_DIR
 rm -rf $DIR/[df][0-9]*
 
@@ -98,6 +101,8 @@ run_test 8 "touch: drop rep (bug 1423)"
 
 #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"
@@ -188,6 +193,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
@@ -208,6 +215,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)
@@ -262,6 +271,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
@@ -288,6 +299,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
@@ -345,6 +358,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
@@ -360,6 +375,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
@@ -599,6 +616,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
@@ -617,6 +636,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`"
@@ -639,6 +659,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"
         sleep 1 # wait connections being established
@@ -663,26 +685,28 @@ 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=$!
        sleep 1
+       local save_FAILURE_MODE=$FAILURE_MODE
        FAILURE_MODE="SOFT"
        facet_failover $SINGLEMDS
 #define OBD_FAIL_OSC_SHUTDOWN            0x407
-       lctl set_param fail_loc=0x80000407
+       do_facet $SINGLEMDS lctl set_param fail_loc=0x80000407
        # need to wait for reconnect
        echo -n waiting for fail_loc
-       while [ `lctl get_param -n fail_loc` -eq -2147482617 ]; do
+       while [ $(do_facet $SINGLEMDS lctl get_param -n fail_loc) -eq -2147482617 ]; do
            sleep 1
            echo -n .
        done
+       do_facet $SINGLEMDS lctl get_param -n fail_loc
        facet_failover $SINGLEMDS
        #no crashes allowed!
         kill -USR1 $CLIENT_PID
        wait $CLIENT_PID 
        true
+       FAILURE_MODE=$save_FAILURE_MODE
 }
 run_test 27 "fail LOV while using OSC's"
 
@@ -770,6 +794,8 @@ test_52_guts() {
 }
 
 test_52() {
+       remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
        mkdir -p $DIR/$tdir
        test_52_guts
        rc=$?
@@ -810,11 +836,12 @@ 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
 
        # first dd should be finished quickly
+       lfs setstripe DIR/$tdir/$tfile-1 -c 1 -i 0
        dd if=/dev/zero of=$DIR/$tdir/$tfile-1 bs=32M count=4  &
        DDPID=$!
        count=0
@@ -829,8 +856,9 @@ test_55() {
        done    
        echo "(dd_pid=$DDPID, time=$count)successful"
 
-        #define OBD_FAIL_OST_DROP_REQ            0x21d
-       do_facet ost lctl set_param fail_loc=0x0000021d
+       lfs setstripe DIR/$tdir/$tfile-2 -c 1 -i 0
+       #define OBD_FAIL_OST_DROP_REQ            0x21d
+       do_facet ost1 lctl set_param fail_loc=0x0000021d
        # second dd will be never finished
        dd if=/dev/zero of=$DIR/$tdir/$tfile-2 bs=32M count=4  &        
        DDPID=$!
@@ -849,7 +877,7 @@ test_55() {
        echo "(dd_pid=$DDPID, time=$count)successful"
 
        #Recover fail_loc and dd will finish soon
-       do_facet ost lctl set_param fail_loc=0
+       do_facet ost1 lctl set_param fail_loc=0
        count=0
        echo  "step3: testing ......"
        while [ true ]; do

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 4482716..c0a9fe4 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -24,7 +24,8 @@ init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
-#
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 5 14"
 
 build_test_filter
@@ -316,6 +317,8 @@ test_16() {
 run_test 16 "fail MDS during recovery (3571)"
 
 test_17() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     createmany -o $MOUNT1/$tfile- 25
     createmany -o $MOUNT2/$tfile-2- 1
 

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 14b957c..c2e493b 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -13,6 +13,8 @@ init_test_env $@
 ostfailover_HOST=${ostfailover_HOST:-$ost_HOST}
 #failover= must be defined in OST_MKFS_OPTIONS if ostfailover_HOST != ost_HOST
 
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 # Tests that fail on uml
 CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
 [ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 6"
@@ -122,6 +124,8 @@ kbytesfree() {
 }
 
 test_6() {
+    remote_mds_nodsh && skip "remote MDS with nodsh" && return 0
+
     f=$DIR/$tfile
     rm -f $f
     sync && sleep 2 && sync    # wait for delete thread

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 209206e..59dcfa3 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -16,6 +16,7 @@ init_test_env $@
 CHECK_GRANT=${CHECK_GRANT:-"yes"}
 GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
 
+remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0
 
 # Skip these tests
 # bug number:  17466
@@ -50,6 +51,8 @@ test_0a() {   # was test_0
 run_test 0a "empty replay"
 
 test_0b() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     # this test attempts to trigger a race in the precreation code,
     # and must run before any other objects are created on the filesystem
     fail ost1
@@ -918,6 +921,8 @@ run_test 42 "recovery after ost failure"
 
 # timeout in MDS/OST recovery RPC will LBUG MDS
 test_43() { # bug 2530
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     replay_barrier $SINGLEMDS
 
     # OBD_FAIL_OST_CREATE_NET 0x204
@@ -1009,6 +1014,8 @@ test_46() {
 run_test 46 "Don't leak file handle after open resend (3325)"
 
 test_47() { # bug 2824
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     # create some files to make sure precreate has been done on all
     # OSTs. (just in case this test is run independently)
     createmany -o $DIR/$tfile 20  || return 1
@@ -1032,6 +1039,8 @@ test_47() { # bug 2824
 run_test 47 "MDS->OSC failure during precreate cleanup (2824)"
 
 test_48() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     replay_barrier $SINGLEMDS
     createmany -o $DIR/$tfile 20  || return 1
     # OBD_FAIL_OST_EROFS 0x216
@@ -1403,6 +1412,8 @@ run_test 58c "resend/reconstruct setxattr op"
 # log_commit_thread vs filter_destroy race used to lead to import use after free
 # bug 11658
 test_59() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     mkdir -p $DIR/$tdir
     createmany -o $DIR/$tdir/$tfile-%d 200
     sync
@@ -1448,6 +1459,8 @@ run_test 60 "test llog post recovery init vs llog unlink"
 
 #test race  llog recovery thread vs llog cleanup
 test_61a() {   # was test_61
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     mkdir $DIR/$tdir
     createmany -o $DIR/$tdir/$tfile-%d 800
     replay_barrier ost1 
@@ -1478,6 +1491,8 @@ run_test 61b "test race mds llog sync vs llog cleanup"
 
 #test race  cancel cookie cb vs llog cleanup
 test_61c() {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
 #   OBD_FAIL_OST_CANCEL_COOKIE_TIMEOUT 0x222 
     touch $DIR/$tfile 
     set_nodes_failloc "$(osts_nodes)" 0x80000222
@@ -1544,6 +1559,8 @@ at_start()
 
 test_65a() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     $LCTL dk > /dev/null
     debugsave
@@ -1571,6 +1588,8 @@ run_test 65a "AT: verify early replies"
 
 test_65b() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     # turn on D_ADAPTTO
     debugsave
@@ -1602,6 +1621,8 @@ run_test 65b "AT: verify early replies on packed reply / bulk"
 
 test_66a() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     lctl get_param -n mdc.${FSNAME}-MDT0000-mdc-*.timeouts | grep "portal 12"
     # adjust 5s at a time so no early reply is sent (within deadline)
@@ -1630,6 +1651,8 @@ run_test 66a "AT: verify MDT service time adjusts with no early replies"
 
 test_66b() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     ORIG=$(lctl get_param -n mdc.${FSNAME}-*.timeouts | awk '/network/ {print $4}')
     sysctl -w lustre.fail_val=$(($ORIG + 5))
@@ -1646,6 +1669,8 @@ run_test 66b "AT: verify net latency adjusts"
 
 test_67a() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     CONN1=$(lctl get_param -n osc.*.stats | awk '/_connect/ {total+=$2} END {print total}')
     # sleeping threads may drive values above this
@@ -1665,6 +1690,8 @@ run_test 67a "AT: verify slow request processing doesn't induce reconnects"
 
 test_67b() #bug 3055
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     CONN1=$(lctl get_param -n osc.*.stats | awk '/_connect/ {total+=$2} END {print total}')
 #define OBD_FAIL_OST_PAUSE_CREATE        0x223
@@ -1693,6 +1720,8 @@ run_test 67b "AT: verify instant slowdown doesn't induce reconnects"
 
 test_68 () #bug 13813
 {
+    remote_ost_nodsh && skip "remote OST with nodsh" && return 0
+
     at_start || return 0
     local ldlm_enqueue_min=$(find /sys -name ldlm_enqueue_min)
     [ -z "$ldlm_enqueue_min" ] && skip "missing /sys/.../ldlm_enqueue_min" && return 0

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index 40390b0..a6c8166 100644 (file)
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -34,6 +34,8 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="100 101"
 
 # $RUNAS_ID may get set incorrectly somewhere else

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index b81a241..6298d3d 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -49,6 +49,9 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="9 10 11"
 
 QUOTALOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index c26512d..8f5d366 100644 (file)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -26,6 +26,9 @@ PERM_CONF=$CONFDIR/perm.conf
 SANITYSECLOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 FAIL_ON_ERROR=false
 
+remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+
 ID0=${ID0:-500}
 ID1=${ID1:-501}
 USER0=`cat /etc/passwd|grep :$ID0:$ID0:|cut -d: -f1`

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 1b23f56..3341f43 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -134,9 +134,9 @@ test_2e() {
 run_test 2e "check chmod on root is propagated to others"
 
 test_3() {
-       ( cd $DIR1 ; ln -s this/is/good lnk )
-       [ "this/is/good" = "`perl -e 'print readlink("'$DIR2/lnk'");'`" ] || \
-               error
+       ( cd $DIR1 ; ln -s this/is/good $tfile )
+       [ "this/is/good" = "`perl -e 'print readlink("'$DIR2/$tfile'");'`" ] ||
+               error "link $DIR2/$tfile not as expected"
 }
 run_test 3 "symlink on one mtpt, readlink on another ==========="
 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 6fea734..8e64931 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -212,6 +212,7 @@ load_modules() {
     [ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
     [ -z "$LNETOPTS" -a -n "$MODPROBECONF" ] && \
         LNETOPTS=$(awk '/^options lnet/ { print $0}' $MODPROBECONF | sed 's/^options lnet //g')
+    echo $LNETOPTS | grep -q "accept=all"  || LNETOPTS="$LNETOPTS accept=all";
     echo "lnet options: '$LNETOPTS'"
     # note that insmod will ignore anything in modprobe.conf
     load_module ../lnet/lnet/lnet $LNETOPTS
@@ -1422,15 +1423,6 @@ set_nodes_failloc () {
     done
 }
 
-set_nodes_failloc () {
-    local nodes=$1
-    local node
-
-    for node in $nodes ; do
-        do_node $node lctl set_param fail_loc=$2
-    done
-}
-
 cancel_lru_locks() {
     $LCTL mark "cancel_lru_locks $1 start"
     for d in `lctl get_param -N ldlm.namespaces.*.lru_size | egrep -i $1`; do
@@ -1744,7 +1736,8 @@ osc_to_ost()
 
 remote_mds ()
 {
-    [ -z "$(lctl dl | grep mdt)" ]
+    local var=${SINGLEMDS}_HOST
+    [ "${!var}" != "$(hostname)" ]
 }
 
 remote_mds_nodsh()
@@ -1754,7 +1747,7 @@ remote_mds_nodsh()
 
 remote_ost ()
 {
-    [ -z "$(lctl dl | grep ost)" ]
+    [ "$ost_HOST" != "$(hostname)" ]
 }
 
 remote_ost_nodsh()