summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
269a157)
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 <bzzz@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/37669
Reviewed-by: Olaf Faaland-LLNL <faaland1@llnl.gov>
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
sleep 55
stop $SINGLEMDS || error "stop MDS failed"
do_facet $SINGLEMDS $LCTL set_param fail_loc=0
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
}
error "start MDS failed"
zconf_mount_clients $CLIENTS $MOUNT
}
mount_mds_client
local cnt
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
grep export_flags.*no_recovery | wc -l)
echo "$cnt clients with recovery disabled"
umount_mds_client
do_facet mds1 $LCTL set_param mdt.*.local_recovery=1
mount_mds_client
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
grep export_flags.*no_recovery | wc -l)
echo "$cnt clients with recovery disabled"
umount_mds_client
$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"
$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
lfsck_prep() {
local ndirs=$1
$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"
$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
scrub_prep() {
local nfiles=$1
[ -n "$FILESET" ] && skip "Not functional for FILESET set"
scrub_prep 0
[ -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 }')
scrub_start_mds 1 "$MOUNT_OPTS_SCRUB"
local FLAGS=$($SHOW_SCRUB | awk '/^flags/ { print $2 }')
echo "stop $SINGLEMDS"
stop $SINGLEMDS > /dev/null || error "(6) Fail to stop MDS!"
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!"
start $SINGLEMDS $(mdsdevname 1) $MOUNT_OPTS_NOSCRUB > /dev/null ||
error "(7) Fail to start MDS!"
get_lustre_env
# use localrecov to enable recovery for local clients, LU-12722
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 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"}
}
[[ $OST1_VERSION -lt $(version_code 2.13.52) ]] ||
export OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o localrecov"}
}