From: grev <grev>
Date: Wed, 28 May 2008 20:02:53 +0000 (+0000)
Subject: b=15876
X-Git-Tag: v1_8_0_110~492
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d9a3d1e7fc8d63774ae6de5eea8c7c29ecec619e;p=fs%2Flustre-release.git

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 5a3b1d2..3185ba2 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -244,20 +244,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