LU-13379 tests: don't use localrecov for older servers

Don't add the "-o localrecov" mount option to older MDT and OST
mounts, since that option is not supported there.

Fixes: 8bd04b4e5766 ("LU-12722 target: disable recovery for local clients")
Test-Parameters: trivial testlist=runtests serverversion=2.12
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Idc0ba22c9b648d49515f5e0f2d8271c8573ebbe5
Reviewed-on: https://review.whamcloud.com/38022
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index fe73fd5..df6c5c3 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -34,8 +34,7 @@ MDSSIZE=${MDSSIZE:-250000}
 #
 MDSOPT=${MDSOPT:-}
 MDS_FS_MKFS_OPTS=${MDS_FS_MKFS_OPTS:-}
 #
 MDSOPT=${MDSOPT:-}
 MDS_FS_MKFS_OPTS=${MDS_FS_MKFS_OPTS:-}

-# use localrecov to enable recovery on local clients, LU-12722
-MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:--olocalrecov}
+MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-}

 # <facet_type>_MOUNT_FS_OPTS is the mount options specified when formatting
 # the underlying device by argument "--mountfsoptions"
 MDS_MOUNT_FS_OPTS=${MDS_MOUNT_FS_OPTS:-}
 # <facet_type>_MOUNT_FS_OPTS is the mount options specified when formatting
 # the underlying device by argument "--mountfsoptions"
 MDS_MOUNT_FS_OPTS=${MDS_MOUNT_FS_OPTS:-}


@@ -51,8 +50,7 @@ OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
 OSTSIZE=${OSTSIZE:-400000}
 OSTOPT=${OSTOPT:-}
 OST_FS_MKFS_OPTS=${OST_FS_MKFS_OPTS:-}
 OSTSIZE=${OSTSIZE:-400000}
 OSTOPT=${OSTOPT:-}
 OST_FS_MKFS_OPTS=${OST_FS_MKFS_OPTS:-}

-# use localrecov to enable recovery on local clients, LU-12722
-OST_MOUNT_OPTS=${OST_MOUNT_OPTS:--olocalrecov}
+OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-}

 OST_MOUNT_FS_OPTS=${OST_MOUNT_FS_OPTS:-}
 OST_INDEX_LIST=${OST_INDEX_LIST:-}
 # Can specify individual ost devs with
 OST_MOUNT_FS_OPTS=${OST_MOUNT_FS_OPTS:-}
 OST_INDEX_LIST=${OST_INDEX_LIST:-}
 # Can specify individual ost devs with

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 186c66b..678ff62 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -429,6 +429,11 @@ init_test_env() {
        . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
        get_lustre_env
 
        . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
        get_lustre_env
 

+       # use localrecov to enable recovery for local clients, LU-12722
+       [[ $MDS1_VERSION -lt $(version_code 2.13.52) ]] ||
+               export MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o localrecov"}
+       [[ $OST1_VERSION -lt $(version_code 2.13.52) ]] ||
+               export OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o localrecov"}

 }
 
 check_cpt_number() {
 }
 
 check_cpt_number() {