From 49acd1450fff0f710924b008ab85fdb3f5f68015 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Thu, 20 Feb 2020 14:57:08 +0300 Subject: [PATCH] LU-13284 tests: few tests miss MDS_MOUNT_OPTS/OST_MOUNT_OPTS Some tests mount servers without MDS_MOUNT_OPTS or OST_MOUNT_OPTS, then localrecov mount option is lost and subsequent tests may fail in a local testing environment. Fixes: 8bd04b4e57 ("LU-12722 target: disable recovery for local clients") Change-Id: I4e5d3a8678d027809ea9a0d129fbfbc8c6beae09 Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/37669 Reviewed-by: Olaf Faaland-LLNL Reviewed-by: Mike Pershin Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/recovery-small.sh | 6 +++--- lustre/tests/sanity-lfsck.sh | 2 +- lustre/tests/sanity-scrub.sh | 8 ++++---- lustre/tests/test-framework.sh | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 77992a7..c5166e9 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -2890,7 +2890,7 @@ test_138() { sleep 55 stop $SINGLEMDS || error "stop MDS failed" do_facet $SINGLEMDS $LCTL set_param fail_loc=0 - start $SINGLEMDS $(mdsdevname ${SINGLEMDS//mds/}) || + start $SINGLEMDS $(mdsdevname ${SINGLEMDS//mds/}) $MDS_MOUNT_OPTS || error "start MDS failed" zconf_mount_clients $CLIENTS $MOUNT } @@ -2929,7 +2929,7 @@ test_140a() { mount_mds_client local cnt - cnt=$(do_facet mds1 $LCTL get_param "mdt.*.exports.*.export" | + cnt=$(do_facet mds1 $LCTL get_param "mdt.*MDT0000.exports.*.export" | grep export_flags.*no_recovery | wc -l) echo "$cnt clients with recovery disabled" umount_mds_client @@ -2940,7 +2940,7 @@ test_140a() { do_facet mds1 $LCTL set_param mdt.*.local_recovery=1 mount_mds_client - cnt=$(do_facet mds1 $LCTL get_param "mdt.*.exports.*.export" | + cnt=$(do_facet mds1 $LCTL get_param "mdt.*MDT0000.exports.*.export" | grep export_flags.*no_recovery | wc -l) echo "$cnt clients with recovery disabled" umount_mds_client diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh index adcf4951..755d823 100644 --- a/lustre/tests/sanity-lfsck.sh +++ b/lustre/tests/sanity-lfsck.sh @@ -68,7 +68,7 @@ SHOW_LAYOUT_ON_OST="do_facet ost1 \ $LCTL get_param -n obdfilter.${OST_DEV}.lfsck_layout" MOUNT_OPTS_SCRUB="$MDS_MOUNT_OPTS -o user_xattr" MOUNT_OPTS_NOSCRUB="$MDS_MOUNT_OPTS -o user_xattr,noscrub" -MOUNT_OPTS_SKIP_LFSCK="-o user_xattr,skip_lfsck" +MOUNT_OPTS_SKIP_LFSCK="$MDS_MOUNT_OPTS -o user_xattr,skip_lfsck" lfsck_prep() { local ndirs=$1 diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh index fa6e043..c253814 100644 --- a/lustre/tests/sanity-scrub.sh +++ b/lustre/tests/sanity-scrub.sh @@ -86,8 +86,8 @@ SHOW_SCRUB="do_facet $SINGLEMDS \ $LCTL get_param -n osd-*.${MDT_DEV}.oi_scrub" SHOW_SCRUB_ON_OST="do_facet ost1 \ $LCTL get_param -n osd-*.${OST_DEV}.oi_scrub" -MOUNT_OPTS_SCRUB="-o user_xattr" -MOUNT_OPTS_NOSCRUB="-o user_xattr,noscrub" +MOUNT_OPTS_SCRUB="$MDS_MOUNT_OPTS -o user_xattr" +MOUNT_OPTS_NOSCRUB="$MDS_MOUNT_OPTS -o user_xattr,noscrub" scrub_prep() { local nfiles=$1 @@ -356,7 +356,7 @@ test_1a() { [ -n "$FILESET" ] && skip "Not functional for FILESET set" scrub_prep 0 - echo "start $SINGLEMDS without disabling OI scrub" + echo "start $SINGLEMDS without disabling OI scrub: $MOUNT_OPTS_SCRUB" scrub_start_mds 1 "$MOUNT_OPTS_SCRUB" local FLAGS=$($SHOW_SCRUB | awk '/^flags/ { print $2 }') @@ -373,7 +373,7 @@ test_1a() { echo "stop $SINGLEMDS" stop $SINGLEMDS > /dev/null || error "(6) Fail to stop MDS!" - echo "start $SINGLEMDS with disabling OI scrub" + echo "start $SINGLEMDS with disabling OI scrub: $MOUNT_OPTS_NOSCRUB" start $SINGLEMDS $(mdsdevname 1) $MOUNT_OPTS_NOSCRUB > /dev/null || error "(7) Fail to start MDS!" diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index bf06109..0a34e25 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -434,8 +434,11 @@ init_test_env() { get_lustre_env # use localrecov to enable recovery for local clients, LU-12722 - [[ $MDS1_VERSION -lt $(version_code 2.13.52) ]] || + [[ $MDS1_VERSION -lt $(version_code 2.13.52) ]] || { export MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o localrecov"} + export MGS_MOUNT_OPTS=${MGS_MOUNT_OPTS:-"-o localrecov"} + } + [[ $OST1_VERSION -lt $(version_code 2.13.52) ]] || export OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o localrecov"} } -- 1.8.3.1