b=15876

i=Adilger

skip LFSCK test for remote MDS also

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index ab24ac7..66fe8d6 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -250,20 +250,19 @@ 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
                title lfsck
                E2VER=`e2fsck -V 2>&1 | head -n 1 | cut -d' ' -f 2`
-               if grep -q obdfilter /proc/fs/lustre/devices; then
-                       if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
-                          [ "`echo $E2VER | grep cfs`" -o \
-                               "`echo $E2VER | grep sun`" ]; then
-                                       bash lfscktest.sh
-                       else
-                               e2fsck -V
-                               echo "e2fsck does not support lfsck, skipping"
-                       fi
+               if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
+                  [ "`echo $E2VER | grep cfs`" -o \
+                       "`echo $E2VER | grep sun`" ]; then
+                               bash lfscktest.sh
                else
-                       echo "remote OST, skipping test"
+                       e2fsck -V
+                       echo "e2fsck does not support lfsck, skipping"
                fi
                LFSCK="done"
        fi