X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=3b77e077a9032afa6e54518c686237eff3aae08c;hb=07660ad33a7d109cced29b6400f99f25adab3f54;hp=7a25e4bbc99a2166657c5a3f25202a4f25292d76;hpb=acc918d76856ff14306c543c74e6ceef3865bcbc;p=fs%2Flustre-release.git diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 7a25e4b..3b77e07 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -556,11 +556,7 @@ run_test 17l "Ensure lgetxattr's returned xattr size is consistent ========" test_17m() { local short_sym="0123456789" local WDIR=$DIR/${tdir}m - local mds_index - local devname - local cmd local i - local rc=0 remote_mds_nodsh && skip "remote MDS with nodsh" && return [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] && @@ -593,49 +589,42 @@ test_17m() { echo "recreate the 512 symlink files with a shorter string" for ((i = 0; i < 512; ++i)); do # rewrite the symlink file with a shorter string - ln -sf ${long_sym} $WDIR/long-$i - ln -sf ${short_sym} $WDIR/short-$i + ln -sf ${long_sym} $WDIR/long-$i || error "long_sym failed" + ln -sf ${short_sym} $WDIR/short-$i || error "short_sym failed" done - mds_index=$($LFS getstripe -M $WDIR) - mds_index=$((mds_index+1)) - devname=$(mdsdevname $mds_index) - cmd="$E2FSCK -fnvd $devname" + local mds_index=$(($($LFS getstripe -M $WDIR) + 1)) + local devname=$(mdsdevname $mds_index) - echo "stop and checking mds${mds_index}: $cmd" + echo "stop and checking mds${mds_index}:" # e2fsck should not return error stop mds${mds_index} - do_facet mds${mds_index} $cmd || rc=$? + run_e2fsck $(facet_active_host mds${mds_index}) $devname -n + rc=$? start mds${mds_index} $devname $MDS_MOUNT_OPTS || error "start failed" df $MOUNT > /dev/null 2>&1 - [ $rc -ne 0 ] && error "e2fsck should not report error upon "\ - "short/long symlink MDT: rc=$rc" - return $rc + [ $rc -eq 0 ] || + error "e2fsck detected error for short/long symlink: rc=$rc" } run_test 17m "run e2fsck against MDT which contains short/long symlink" check_fs_consistency_17n() { local mdt_index - local devname - local cmd local rc=0 # create/unlink in 17n only change 2 MDTs(MDT1/MDT2), # so it only check MDT1/MDT2 instead of all of MDTs. - for mdt_index in $(seq 1 2); do - devname=$(mdsdevname $mdt_index) - cmd="$E2FSCK -fnvd $devname" - - echo "stop and checking mds${mdt_index}: $cmd" + for mdt_index in 1 2; do + local devname=$(mdsdevname $mdt_index) # e2fsck should not return error stop mds${mdt_index} - do_facet mds${mdt_index} $cmd || rc=$? + run_e2fsck $(facet_active_host mds$mdt_index) $devname -n || + rc=$((rc + $?)) start mds${mdt_index} $devname $MDS_MOUNT_OPTS || - error "mount mds${mdt_index} failed" + error "mount mds$mdt_index failed" df $MOUNT > /dev/null 2>&1 - [ $rc -ne 0 ] && break done return $rc } @@ -1885,6 +1874,7 @@ check_seq_oid() $(facet_mntpt ost$ost)/$obj_file) unmount_fstype ost$ost start ost$ost $dev $OST_MOUNT_OPTS + clients_up fi [ -z "$ff" ] && error "$obj_file: no filter_fid info" @@ -5649,7 +5639,7 @@ test_68b() { # was test_68 run_test 68b "support swapping to Lustre ========================" # bug5265, obdfilter oa2dentry return -ENOENT -# #define OBD_FAIL_OST_ENOENT 0x217 +# #define OBD_FAIL_SRV_ENOENT 0x217 test_69() { [ $PARALLEL == "yes" ] && skip "skip parallel run" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -7597,7 +7587,7 @@ test_118b() reset_async - #define OBD_FAIL_OST_ENOENT 0x217 + #define OBD_FAIL_SRV_ENOENT 0x217 set_nodes_failloc "$(osts_nodes)" 0x217 $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c RC=$? @@ -8698,7 +8688,18 @@ set_dir_limits () { do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" || LDPROC=/sys/fs/ldiskfs do_facet $facet "echo $1 >$LDPROC/$canondev/max_dir_size" + do_facet $facet "test -e $LDPROC/$canondev/warning_dir_size" || + LDPROC=/sys/fs/ldiskfs + do_facet $facet "echo $2 >$LDPROC/$canondev/warning_dir_size" + done +} + +check_mds_dmesg() { + local facets=$(get_facets MDS) + for facet in ${facets//,/ }; do + do_facet $facet "dmesg | tail -3 | grep -q $1" && return 0 done + return 1 } test_129() { @@ -8710,6 +8711,7 @@ test_129() { remote_mds_nodsh && skip "remote MDS with nodsh" && return ENOSPC=28 EFBIG=27 + has_warning=0 rm -rf $DIR/$tdir test_mkdir -p $DIR/$tdir @@ -8717,8 +8719,8 @@ test_129() { # block size of mds1 local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local MDSBLOCKSIZE=$($LCTL get_param -n mdc.*MDT0000*.blocksize) - local MAX=$((MDSBLOCKSIZE * 3)) - set_dir_limits $MAX + local MAX=$((MDSBLOCKSIZE * 5)) + set_dir_limits $MAX $MAX local I=$(stat -c%s "$DIR/$tdir") local J=0 local STRIPE_COUNT=1 @@ -8727,15 +8729,25 @@ test_129() { while [[ $I -le $MAX ]]; do $MULTIOP $DIR/$tdir/$J Oc rc=$? + if [ $has_warning -eq 0 ]; then + check_mds_dmesg '"is approaching"' && + has_warning=1 + fi #check two errors ENOSPC for new version of ext4 max_dir_size patch #mainline kernel commit df981d03eeff7971ac7e6ff37000bfa702327ef1 #and EFBIG for previous versions if [ $rc -eq $EFBIG -o $rc -eq $ENOSPC ]; then - set_dir_limits 0 + set_dir_limits 0 0 echo "return code $rc received as expected" multiop $DIR/$tdir/$J Oc || error_exit "multiop failed w/o dir size limit" + check_mds_dmesg '"has reached"' || + error_exit "has reached message should be output" + + [ $has_warning ] || + error_exit "warning message should be output" + I=$(stat -c%s "$DIR/$tdir") if [ $(lustre_version_code $SINGLEMDS) -lt \ @@ -8747,7 +8759,7 @@ test_129() { fi error_exit "current dir size $I, previous limit $MAX" elif [ $rc -ne 0 ]; then - set_dir_limits 0 + set_dir_limits 0 0 error_exit "return code $rc received instead of expected " \ "$EFBIG or $ENOSPC, files in dir $I" fi @@ -8755,7 +8767,7 @@ test_129() { I=$(stat -c%s "$DIR/$tdir") done - set_dir_limits 0 + set_dir_limits 0 0 error "exceeded dir size limit $MAX($MDSCOUNT) : $I bytes" } run_test 129 "test directory size limit ========================"