Branch HEAD

b=13698
i=tappro
i=grev

get mntdev from osd proc and add df to sync data

lustre/tests/lfscktest.sh

@@ -15,8 +15,6 @@ GETFATTR=${GETFATTR:-getfattr}
 SETFATTR=${SETFATTR:-setfattr}
 MAX_ERR=1
 
-FSTYPE=${FSTYPE:-ldiskfs}
-
 export PATH=$LFSCK_PATH:`dirname $0`:`dirname $0`/../utils:$PATH
 
 [ -z "`which $GETFATTR`" ] && echo "$0: $GETFATTR not found" && exit 5
@@ -120,7 +118,8 @@ if [ "$LFSCK_SETUP" != "no" ]; then
 	done
 	MDS_REMOVE=`echo $MDS_REMOVE | sed "s#$MOUNT/##g"`
 
-	MDTDEVS=`get_mnt_devs mds`
+	# when the OST is also using an OSD this needs to be fixed
+	MDTDEVS=`get_mnt_devs osd`
 	OSTDEVS=`get_mnt_devs obdfilter`
 	OSTCOUNT=`echo $OSTDEVS | wc -w`
 	sh llmountcleanup.sh || exit 40
@@ -163,7 +162,8 @@ if [ "$LFSCK_SETUP" != "no" ]; then
 
 	do_umount
 else
-	MDTDEVS=`get_mnt_devs mds`
+	# when the OST is also using an OSD this needs to be fixed
+	MDTDEVS=`get_mnt_devs osd`
 	OSTDEVS=`get_mnt_devs obdfilter`
 	OSTCOUNT=`echo $OSTDEVS | wc -w`
 fi # LFSCK_SETUP
@@ -173,6 +173,7 @@ fi # LFSCK_SETUP
 set +e
 
 echo "e2fsck -d -v -fn --mdsdb $MDSDB $MDSDEV"
+df > /dev/null	# update statfs data on disk
 e2fsck -d -v -fn --mdsdb $MDSDB $MDSDEV
 RET=$?
 [ $RET -gt $MAX_ERR ] && echo "e2fsck returned $RET" && exit 90 || true
@@ -180,6 +181,7 @@ RET=$?
 export OSTDB_LIST=""
 i=0
 for OSTDEV in $OSTDEVS; do
+	df > /dev/null	# update statfs data on disk
 	e2fsck -d -v -fn --mdsdb $MDSDB --ostdb $OSTDB-$i $OSTDEV
 	RET=$?
 	[ $RET -gt $MAX_ERR ] && echo "e2fsck returned $RET" && exit 100
@@ -205,6 +207,7 @@ sync; sleep 2; sync
 
 echo "LFSCK TEST 2"
 echo "e2fsck -d -v -fn --mdsdb $MDSDB $MDSDEV"
+df > /dev/null	# update statfs data on disk
 e2fsck -d -v -fn --mdsdb $MDSDB $MDSDEV
 RET=$?
 [ $RET -gt $MAX_ERR ] && echo "e2fsck returned $RET" && exit 123 || true
@@ -212,6 +215,7 @@ RET=$?
 i=0
 export OSTDB_LIST=""
 for OSTDEV in $OSTDEVS; do
+	df > /dev/null	# update statfs data on disk
 	e2fsck -d -v -fn --mdsdb $MDSDB --ostdb $OSTDB-$i $OSTDEV
 	RET=$?
 	[ $RET -gt $MAX_ERR ] && echo "e2fsck returned $RET" && exit 124