X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Fmds-survey.sh;h=63510e9499b25d0f1cc1622f38d472a2aea821fd;hb=ad32c0736a971f74cbf5e750c6cae90320ec2589;hp=26987c2d23815b7be56f15880b92d53e7291efb2;hpb=1bf858d5e1985aabafb90f4a011b737f95504b67;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh
index 26987c2..63510e9 100644
--- a/lustre/tests/mds-survey.sh
+++ b/lustre/tests/mds-survey.sh
@@ -8,9 +8,6 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-build_test_filter
-check_and_setup_lustre
-
 file_count=${file_count:-150000}
 dir_count=${dir_count:-4}
 thrhi=${thrhi:-8}
@@ -26,6 +23,13 @@ if [ -z ${MDSSURVEY} ]; then
     skip_env "mds-survey not found" && exit
 fi
 
+if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.51) ]; then
+	skip_env "Need MDS version at least 2.3.51" && exit
+fi
+
+build_test_filter
+check_and_setup_lustre
+
 adjust_inode() {
     local require_inode=0
     local avail_mdt_inode=0
@@ -33,8 +37,7 @@ adjust_inode() {
 
     require_inode=$((file_count * thrhi))
     # get available inode for mdt
-    avail_mdt_inode=$($LFS df -i $MOUNT | grep "filesystem summary:"  | \
-        awk '{print $5}')
+    avail_mdt_inode=$(lfs_df -i $MOUNT | grep "summary" | awk '{print $4}')
     avail_mdt_inode=$((avail_mdt_inode * 9 / 10))
 
     # get available inode for ost
@@ -105,7 +108,7 @@ run_test 2 "Metadata survey with stripe_count = 1"
 # remount the clients
 restore_mount $MOUNT
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 cleanup_echo_devs
 check_and_cleanup_lustre
 exit_status