X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=3c6a42a5937e628d597862a6e5717f6328df0904;hp=79cec180f34decd837f991ffa70d8cca98c10baf;hb=1d97a8b4cd3de9074f323332c7b736367a70d419;hpb=da0501850bbe8618b474ca18878b8b260335f6bf diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 79cec18..3c6a42a 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -15,7 +15,7 @@ init_logging ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 32newtarball" # bug number for skipped test: LU-11915 -ALWAYS_EXCEPT="$ALWAYS_EXCEPT 110" +ALWAYS_EXCEPT="$ALWAYS_EXCEPT 110 115" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! if $SHARED_KEY; then @@ -43,9 +43,9 @@ build_test_filter STORED_MDSSIZE=$MDSSIZE STORED_OSTSIZE=$OSTSIZE MDSSIZE=200000 -[ $(facet_fstype $SINGLEMDS) = "zfs" ] && MDSSIZE=400000 +[ "$mds1_FSTYPE" = zfs ] && MDSSIZE=400000 OSTSIZE=200000 -[ $(facet_fstype ost1) = "zfs" ] && OSTSIZE=400000 +[ "$ost1_FSTYPE" = zfs ] && OSTSIZE=400000 fs2mds_HOST=$mds_HOST fs2ost_HOST=$ost_HOST @@ -113,6 +113,16 @@ start_mdt() { start $facet ${dev} $MDS_MOUNT_OPTS $@ || return 94 } +stop_mdt_no_force() { + local num=$1 + local facet=mds$num + local dev=$(mdsdevname $num) + shift 1 + + echo "stop mds service on `facet_active_host $facet`" + stop $facet || return 97 +} + stop_mdt() { local num=$1 local facet=mds$num @@ -175,16 +185,11 @@ stop_ost2() { } mount_client() { - local MOUNTPATH=$1 - echo "mount $FSNAME on ${MOUNTPATH}....." - zconf_mount $(hostname) $MOUNTPATH || return 96 -} + local mountpath=$1 + local mountopt="$2" -remount_client() { - local mountopt="remount,$1" - local MOUNTPATH=$2 - echo "remount '$1' lustre on ${MOUNTPATH}....." - zconf_mount $(hostname) $MOUNTPATH "$mountopt" || return 96 + echo "mount $FSNAME ${mountopt:+with opts $mountopt} on $mountpath....." + zconf_mount $HOSTNAME $mountpath $mountopt || return 96 } umount_client() { @@ -499,7 +504,7 @@ run_test 5f "mds down, cleanup after failed mount (bug 2712)" test_5g() { modprobe lustre - [ $(lustre_version_code client) -lt $(version_code 2.9.53) ] && + [ "$CLIENT_VERSION" -lt $(version_code 2.9.53) ] && skip "automount of debugfs missing before 2.9.53" umount /sys/kernel/debug $LCTL get_param -n devices | egrep -v "error" && \ @@ -592,7 +597,7 @@ run_test 9 "test ptldebug and subsystem for mkfs" # test_17() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -620,7 +625,7 @@ test_17() { run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should return errs)" test_18() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -706,10 +711,10 @@ test_20() { mount_client $MOUNT || error "mount_client $MOUNT failed" check_mount || error "check_mount failed" rm -f $DIR/$tfile || error "remove $DIR/$tfile failed." - remount_client ro $MOUNT || error "remount_client with ro failed" + mount_client $MOUNT remount,ro || error "remount client with ro failed" touch $DIR/$tfile && error "$DIR/$tfile created incorrectly" [ -e $DIR/$tfile ] && error "$DIR/$tfile exists incorrectly" - remount_client rw $MOUNT || error "remount_client with rw failed" + mount_client $MOUNT remount,rw || error "remount client with rw failed" touch $DIR/$tfile || error "touch $DIR/$tfile failed" MCNT=$(grep -c $MOUNT' ' /etc/mtab) [ "$MCNT" -ne 1 ] && error "$MOUNT in /etc/mtab $MCNT times" @@ -762,12 +767,18 @@ test_21d() { start_mds || error "MDS start failed" wait_osc_import_state mds ost2 FULL + local zkeeper=${KEEP_ZPOOL} + stack_trap "KEEP_ZPOOL=$zkeeper" EXIT + KEEP_ZPOOL="true" + stop_ost || error "Unable to stop OST1" stop_ost2 || error "Unable to stop OST2" stop_mds || error "Unable to stop MDS" stop_mgs #writeconf to remove all ost2 traces for subsequent tests writeconf_or_reformat + KEEP_ZPOOL="${zkeeper}" + start_mgs || error "unable to start MGS" } run_test 21d "start mgs then ost and then mds" @@ -1110,9 +1121,9 @@ test_28A() { # was test_28 run_test 28A "permanent parameter setting" test_28a() { # LU-4221 - [[ $(lustre_version_code ost1) -ge $(version_code 2.5.52) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.5.52) ]] || skip "Need OST version at least 2.5.52" - [ "$(facet_fstype ost1)" = "zfs" ] && + [ "$ost1_FSTYPE" = zfs ] && skip "LU-4221: no such proc params for ZFS OSTs" local name @@ -1339,7 +1350,6 @@ test_32newtarball() { local dst=. local src=/etc/rc.d local tmp=$TMP/t32_image_create - local server_version=$(lustre_version_code $SINGLEMDS) local remote_dir local striped_dir local pushd_dir @@ -1370,7 +1380,7 @@ test_32newtarball() { setupall - [[ $server_version -ge $(version_code 2.3.50) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.3.50) ]] || $LFS quotacheck -ug /mnt/$FSNAME $LFS setquota -u $T32_QID -b 0 -B $T32_BLIMIT -i 0 -I $T32_ILIMIT \ /mnt/$FSNAME @@ -1382,7 +1392,7 @@ test_32newtarball() { $LFS mkdir -i 1 $remote_dir tar cf - -C $tmp/src . | tar xf - -C $remote_dir - if [[ $server_version -ge $(version_code 2.7.0) ]]; then + if [[ "$MDS1_VERSION" -ge $(version_code 2.7.0) ]]; then striped_dir=/mnt/$FSNAME/striped_dir_old $LFS mkdir -i 1 -c 2 $striped_dir tar cf - -C $tmp/src . | tar xf - -C $striped_dir @@ -1398,7 +1408,7 @@ test_32newtarball() { pushd_dir=/mnt/$FSNAME if [[ $MDSCOUNT -ge 2 ]]; then pushd_dir=$remote_dir - if [[ $server_version -ge $(version_code 2.7.0) ]]; then + if [[ "$MDS1_VERSION" -ge $(version_code 2.7.0) ]]; then pushd $striped_dir ls -Rni --time-style=+%s >$tmp/img/list2 popd @@ -1413,7 +1423,7 @@ test_32newtarball() { $LCTL get_param -n version | head -n 1 | sed -e 's/^lustre: *//' >$tmp/img/commit - [[ $server_version -ge $(version_code 2.3.50) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.3.50) ]] || $LFS quotaon -ug /mnt/$FSNAME $LFS quota -u $T32_QID -v /mnt/$FSNAME $LFS quota -v -u $T32_QID /mnt/$FSNAME | @@ -1427,6 +1437,16 @@ test_32newtarball() { echo $T32_BLIMIT > $tmp/img/blimit echo $T32_ILIMIT > $tmp/img/ilimit + $MULTIOP /mnt/$FSNAME/orph_file Ouw_c& + pid=$! + sync + stop_mdt_no_force 1 + debugfs -R "ls /PENDING" ${MDSDEV1:-$MDSDEV} + cp ${MDSDEV1:-$MDSDEV} $tmp/img + start_mdt 1 + kill -s USR1 $pid + wait $pid + stopall pushd $tmp/src @@ -1440,7 +1460,6 @@ test_32newtarball() { uname -r >$tmp/img/kernel uname -m >$tmp/img/arch - mv ${MDSDEV1:-$MDSDEV} $tmp/img for num in $(seq 2 $MDSCOUNT); do local devname=$(mdsdevname $num) local facet=mds$num @@ -1454,7 +1473,7 @@ test_32newtarball() { sed -e 's/\./_/g') # E.g., "1.8.7" -> "1_8" dst=$(cd $dst; pwd) pushd $tmp/img - tar cjvf $dst/disk$version-$(facet_fstype $SINGLEMDS).tar.bz2 -S * + tar cjvf $dst/disk$version-"$mds1_FSTYPE".tar.bz2 -S * popd rm -r $tmp @@ -1473,7 +1492,7 @@ t32_check() { ! $r which "$TUNEFS" && skip_env "tunefs.lustre required on $node" - local IMGTYPE=$(facet_fstype $SINGLEMDS) + local IMGTYPE="$mds1_FSTYPE" tarballs=$($r find $RLUSTRE/tests -maxdepth 1 \ -name \'disk*-$IMGTYPE.tar.bz2\') @@ -1484,7 +1503,6 @@ t32_check() { t32_test_cleanup() { local tmp=$TMP/t32 local facet=$SINGLEMDS - local fstype=$(facet_fstype $facet) local rc=$? if $shall_cleanup_lustre; then @@ -1502,7 +1520,7 @@ t32_test_cleanup() { $r rm -rf $tmp rm -rf $tmp - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then local poolname local poolname_list="t32fs-mdt1 t32fs-ost1" @@ -1532,20 +1550,19 @@ t32_reload_modules() { local node=$1 local all_removed=false local i=0 - local fstype=$(facet_fstype $SINGLEMDS) - [ $fstype == "zfs" ] && do_rpc_nodes $node "service zed stop" + [ "$mds1_FSTYPE" == zfs ] && do_rpc_nodes $node "service zed stop" while ((i < 20)); do echo "Unloading modules on $node: Attempt $i" - do_rpc_nodes $node $LUSTRE_RMMOD $fstype && + do_rpc_nodes $node $LUSTRE_RMMOD "$mds1_FSTYPE" && all_removed=true do_rpc_nodes $node check_mem_leak || return 1 if $all_removed; then do_rpc_nodes $node load_modules return 0 fi - if [ $fstype == "zfs" ]; then + if [ "$mds1_FSTYPE" == zfs ]; then do_rpc_nodes $node "$ZPOOL status -v" fi sleep 5 @@ -1579,7 +1596,6 @@ t32_verify_quota() { local facet=$1 local fsname=$2 local mnt=$3 - local fstype=$(facet_fstype $SINGLEMDS) local qval local cmd @@ -1587,7 +1603,7 @@ t32_verify_quota() { # lustre will estimate the object count usage. This fails quota # verification in 32b. The object quota usage should be accurate after # zfs-0.7.0 is released. - [ $fstype == "zfs" ] && { + [ "$mds1_FSTYPE" == zfs ] && { local zfs_version=$(do_facet $facet cat /sys/module/zfs/version) [ $(version_code $zfs_version) -lt $(version_code 0.7.0) ] && { @@ -1635,11 +1651,11 @@ t32_verify_quota() { } set_persistent_param_and_check $facet \ - "osd-$fstype.$fsname-MDT0000.quota_slave.enabled" \ + "osd-$mds1_FSTYPE.$fsname-MDT0000.quota_slave.enabled" \ "$fsname.quota.mdt" ug set_persistent_param_and_check $facet \ - "osd-$fstype.$fsname-OST0000.quota_slave.enabled" \ + "osd-$mds1_FSTYPE.$fsname-OST0000.quota_slave.enabled" \ "$fsname.quota.ost" ug chmod 0777 $mnt @@ -1688,7 +1704,6 @@ t32_test() { local nrpcs_orig local nrpcs local list - local fstype=$(facet_fstype $SINGLEMDS) local mdt_dev=$tmp/mdt local mdt2_dev=$tmp/mdt2 local ost_dev=$tmp/ost @@ -1732,12 +1747,12 @@ t32_test() { # - ost device img version < 2.3.64 # - ost server version >= 2.5 [ $(version_code $img_commit) -ge $(version_code 2.3.64) -o \ - $(lustre_version_code ost1) -lt $(version_code 2.5.0) ] && + "$OST1_VERSION" -lt $(version_code 2.5.0) ] && ff_convert="no" ! $r test -f $mdt2_dev || mdt2_is_available=true - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then # import pool first local poolname local poolname_list="t32fs-mdt1 t32fs-ost1" @@ -1782,7 +1797,7 @@ t32_test() { if [ "$writeconf" ]; then mopts=writeconf - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" $r $TUNEFS --quota $mdt_dev || { $r losetup -a @@ -1799,7 +1814,7 @@ t32_test() { fi else if [ -n "$($LCTL list_nids | grep -v '\(tcp\|lo\)[[:digit:]]*$')" ]; then - [[ $(lustre_version_code mgs) -ge $(version_code 2.3.59) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.3.59) ]] || skip "LU-2200: Cannot run over IB w/o lctl replace_nids " "(Need MGS version at least 2.3.59)" @@ -1807,7 +1822,7 @@ t32_test() { local ostnid=$(do_node $osthost $LCTL list_nids | head -1) mopts=nosvc - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" fi $r $MOUNT_CMD -o $mopts $mdt_dev $tmp/mnt/mdt @@ -1817,7 +1832,7 @@ t32_test() { fi mopts=exclude=$fsname-OST0000 - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" fi fi @@ -1849,7 +1864,7 @@ t32_test() { local fs2mdsvdev=$(mdsvdevname 1_2) echo "mkfs new MDT on ${fs2mdsdev}...." - if [ $(facet_fstype mds1) == ldiskfs ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mkfsoptions="--mkfsoptions=\\\"-J size=8\\\"" fi @@ -1859,7 +1874,7 @@ t32_test() { return 1 } - [[ $(facet_fstype mds1) != zfs ]] || import_zpool mds1 + [[ "$mds1_FSTYPE" != zfs ]] || import_zpool mds1 $r $TUNEFS --dryrun $fs2mdsdev || { error_noexit "tunefs.lustre before mounting the MDT" @@ -1893,7 +1908,7 @@ t32_test() { } if [ "$writeconf" ]; then mopts=mgsnode=$nid,$writeconf - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" $r $TUNEFS --quota $ost_dev || { $r losetup -a @@ -1903,7 +1918,7 @@ t32_test() { fi else mopts=mgsnode=$nid - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" fi fi @@ -1982,7 +1997,7 @@ t32_test() { return 1 } - if [ "$ff_convert" != "no" -a $(facet_fstype ost1) == "ldiskfs" ]; then + if [ "$ff_convert" != "no" -a "$ost1_FSTYPE" == ldiskfs ]; then $r $LCTL lfsck_start -M $fsname-OST0000 || { error_noexit "Start OI scrub on OST0" return 1 @@ -2141,9 +2156,9 @@ t32_test() { $LFS setdirstripe -D -c2 $tmp/mnt/lustre/striped_dir pushd $tmp/mnt/lustre - tar -cf - . --exclude=./striped_dir \ - --exclude=./striped_dir_old \ - --exclude=./remote_dir | + tar -c --exclude=./striped_dir \ + --exclude=./striped_dir_old \ + --exclude=./remote_dir -f - .| tar -xvf - -C striped_dir 1>/dev/null || { error_noexit "cp to striped dir failed" return 1 @@ -2262,7 +2277,7 @@ t32_test() { fi # migrate files/dirs to remote MDT, then move them back - if [ $(lustre_version_code mds1) -ge $(version_code 2.7.50) -a \ + if [ "$MDS1_VERSION" -ge $(version_code 2.7.50) -a \ $dne_upgrade != "no" ]; then $r $LCTL set_param -n \ mdt.${fsname}*.enable_remote_dir=1 2>/dev/null @@ -2322,12 +2337,25 @@ t32_test() { } shall_cleanup_lustre=false else + $MOUNT_CMD $nid:/$fsname $tmp/mnt/lustre || { + error_noexit "Mounting the client" + return 1 + } + + [[ $(do_facet mds1 pgrep orph_.*-MDD | wc -l) == 0 ]] || + error "MDD orphan cleanup thread not quit" + + umount $tmp/mnt/lustre || { + error_noexit "Unmounting the client" + return 1 + } + if [[ "$dne_upgrade" != "no" ]] || $mdt2_is_available; then $r $UMOUNT $tmp/mnt/mdt1 || { error_noexit "Unmounting the MDT2" return 1 } - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then $r "$ZPOOL export t32fs-mdt2" fi shall_cleanup_mdt1=false @@ -2337,7 +2365,7 @@ t32_test() { error_noexit "Unmounting the MDT" return 1 } - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then $r "$ZPOOL export t32fs-mdt1" fi shall_cleanup_mdt=false @@ -2346,7 +2374,7 @@ t32_test() { error_noexit "Unmounting the OST" return 1 } - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then $r "$ZPOOL export t32fs-ost1" fi shall_cleanup_ost=false @@ -2356,7 +2384,7 @@ t32_test() { return 1 } - if [[ $fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then local poolname=t32fs-mdt1 $r "modprobe zfs; $ZPOOL list -H $poolname >/dev/null 2>&1 || @@ -2375,7 +2403,7 @@ t32_test() { } mopts=exclude=$fsname-OST0000 - if [ $fstype == "ldiskfs" ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mopts="loop,$mopts" fi $r $MOUNT_CMD -o $mopts $mdt_dev $tmp/mnt/mdt || { @@ -2393,6 +2421,7 @@ test_32a() { t32_check for tarball in $tarballs; do + banner "testing $tarball upgrade" t32_test $tarball || let "rc += $?" done return $rc @@ -2406,6 +2435,7 @@ test_32b() { t32_check for tarball in $tarballs; do + banner "testing $tarball upgrade with writeconf" t32_test $tarball writeconf || let "rc += $?" done return $rc @@ -2421,8 +2451,9 @@ test_32c() { t32_check for tarball in $tarballs; do # Do not support 1_8 and 2_1 direct upgrade to DNE2 anymore */ - echo $tarball | grep "1_8" && continue - echo $tarball | grep "2_1" && continue + [[ "$tarball" =~ "1_8" ]] && echo "skip $tarball" && continue + [[ "$tarball" =~ "2_1" ]] && echo "skip $tarball" && continue + banner "testing $tarball upgrade with DNE" load_modules dne_upgrade=yes t32_test $tarball writeconf || rc=$? done @@ -2437,6 +2468,7 @@ test_32d() { t32_check for tarball in $tarballs; do + banner "testing $tarball upgrade with ff convert" ff_convert=yes t32_test $tarball || rc=$? done return $rc @@ -2444,7 +2476,7 @@ test_32d() { run_test 32d "convert ff test" test_32e() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.10.56) ]] || skip "Need MDS version at least 2.10.56" local tarballs @@ -2453,8 +2485,9 @@ test_32e() { t32_check for tarball in $tarballs; do - echo $tarball | grep "2_9" || continue + [[ "$tarball" =~ "2_9" ]] || continue #load_modules + banner "testing $tarball upgrade with DoM" dom_upgrade=yes t32_test $tarball writeconf || let "rc += $?" done return $rc @@ -2480,7 +2513,7 @@ test_33a() { # bug 12333, was test_33 local fs2mdsvdev=$(mdsvdevname 1_2) local fs2ostvdev=$(ostvdevname 1_2) - if [ $(facet_fstype mds1) == ldiskfs ]; then + if [ "$mds1_FSTYPE" == ldiskfs ]; then mkfsoptions="--mkfsoptions=\\\"-J size=8\\\"" # See bug 17931. fi @@ -2810,7 +2843,7 @@ test_37() { local opts=$MDS_MOUNT_OPTS local rc=0 - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -2844,7 +2877,6 @@ test_37() { run_test 37 "verify set tunables works for symlink device" test_38() { # bug 14222 - local fstype=$(facet_fstype $SINGLEMDS) local mntpt=$(facet_mntpt $SINGLEMDS) setup @@ -2939,7 +2971,7 @@ test_40() { # bug 15759 run_test 40 "race during service thread startup" test_41a() { #bug 14134 - if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && + if [ "$mds1_FSTYPE" == ldiskfs ] && ! do_facet $SINGLEMDS test -b $(mdsdevname 1); then skip "Loop devices does not work with nosvc option" fi @@ -2968,7 +3000,7 @@ test_41a() { #bug 14134 run_test 41a "mount mds with --nosvc and --nomgs" test_41b() { - if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && + if [ "$mds1_FSTYPE" == ldiskfs ] && ! do_facet $SINGLEMDS test -b $(mdsdevname 1); then skip "Loop devices does not work with nosvc option" fi @@ -3001,14 +3033,13 @@ test_41b() { run_test 41b "mount mds with --nosvc and --nomgs on first mount" test_41c() { - local server_version=$(lustre_version_code $SINGLEMDS) local oss_list=$(comma_list $(osts_nodes)) - [[ $server_version -ge $(version_code 2.6.52) ]] || - [[ $server_version -ge $(version_code 2.5.26) && - $server_version -lt $(version_code 2.5.50) ]] || - [[ $server_version -ge $(version_code 2.5.4) && - $server_version -lt $(version_code 2.5.11) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.6.52) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.5.26) && + "$MDS1_VERSION" -lt $(version_code 2.5.50) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.5.4) && + "$MDS1_VERSION" -lt $(version_code 2.5.11) ]] || skip "Need MDS version 2.5.4+ or 2.5.26+ or 2.6.52+" # ensure mds1 ost1 have been created even if running sub-test standalone @@ -3028,14 +3059,13 @@ test_41c() { local mds1dev=$(mdsdevname 1) local mds1mnt=$(facet_mntpt mds1) - local mds1fstype=$(facet_fstype mds1) local mds1opts=$MDS_MOUNT_OPTS - if [ $mds1fstype == ldiskfs ] && + if [ "$mds1_FSTYPE" == ldiskfs ] && ! do_facet mds1 test -b $mds1dev; then mds1opts=$(csa_add "$mds1opts" -o loop) fi - if [[ $mds1fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then import_zpool mds1 || return ${PIPESTATUS[0]} fi @@ -3074,14 +3104,13 @@ test_41c() { local ost1dev=$(ostdevname 1) local ost1mnt=$(facet_mntpt ost1) - local ost1fstype=$(facet_fstype ost1) local ost1opts=$OST_MOUNT_OPTS - if [ $ost1fstype == ldiskfs ] && + if [ "$ost1_FSTYPE" == ldiskfs ] && ! do_facet ost1 test -b $ost1dev; then ost1opts=$(csa_add "$ost1opts" -o loop) fi - if [[ $ost1fstype == zfs ]]; then + if [[ "$ost1_FSTYPE" == zfs ]]; then import_zpool ost1 || return ${PIPESTATUS[0]} fi @@ -3172,7 +3201,7 @@ test_42() { #bug 14693 run_test 42 "allow client/server mount/unmount with invalid config param" test_43a() { - [[ $(lustre_version_code mgs) -ge $(version_code 2.5.58) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.5.58) ]] || skip "Need MDS version at least 2.5.58" [ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip_env "run as root" @@ -3323,7 +3352,7 @@ test_43a() { run_test 43a "check root_squash and nosquash_nids" test_43b() { # LU-5690 - [[ $(lustre_version_code mgs) -ge $(version_code 2.7.62) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.7.62) ]] || skip "Need MGS version 2.7.62+" if [[ -z "$fs2mds_DEV" ]]; then @@ -3520,16 +3549,13 @@ test_48() { # bz-17636 LU-7473 # LOV EA, and so on. These EA will use some EA space that is shared by # ACL entries. So here we only check some reasonable ACL entries count, # instead of the max number that is calculated from the max_ea_size. - if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.57) ]; - then + if [ "$MDS1_VERSION" -lt $(version_code 2.8.57) ]; then count=28 # hard coded of RPC protocol - elif [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then - count=4000 # max_num 4091 max_ea_size = ~65536 - elif ! large_xattr_enabled; then - count=450 # max_num 497 max_ea_size = 4012 - else + elif large_xattr_enabled; then count=4500 # max_num 8187 max_ea_size = 65452 - # not create too much (>5000) to save test time + # not create too many (4500) to save test time + else + count=450 # max_num 497 max_ea_size = 4012 fi echo "It is expected to hold at least $count ACL entries" @@ -3833,7 +3859,7 @@ test_50h() { # prepare MDT/OST, make OSC inactive for OST1 [ "$OSTCOUNT" -lt "2" ] && skip_env "needs >=2 OSTs" - [ $(facet_fstype ost1) == zfs ] && import_zpool ost1 + [ "$ost1_FSTYPE" == zfs ] && import_zpool ost1 do_facet ost1 "$TUNEFS --param osc.active=0 `ostdevname 1`" || error "tunefs OST1 failed" start_mds || error "Unable to start MDT" @@ -3896,7 +3922,7 @@ test_50i() { "${FSNAME}-MDT0001.mdc.active" 1 wait_clients_import_state ${CLIENTS:-$HOSTNAME} mds2 FULL - if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.7.60) ] + if [ "$MDS1_VERSION" -ge $(version_code 2.7.60) ] then wait_dne_interconnect fi @@ -4005,7 +4031,7 @@ diff_files_xattrs() } test_52() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4054,7 +4080,7 @@ test_52() { if ! do_node $ost1node test -b $ost1_dev; then loop="-o loop" fi - do_node $ost1node mount -t $(facet_fstype ost1) $loop $ost1_dev \ + do_node $ost1node mount -t "$ost1_FSTYPE" $loop $ost1_dev \ $ost1mnt || error "Unable to mount ost1 as ldiskfs" @@ -4228,7 +4254,7 @@ test_53b() { run_test 53b "check MDS thread count params" test_54a() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4239,7 +4265,7 @@ test_54a() { run_test 54a "test llverdev and partial verify of device" test_54b() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4256,7 +4282,7 @@ lov_objid_size() } test_55() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4294,7 +4320,6 @@ test_55() { run_test 55 "check lov_objid size" test_56a() { - local server_version=$(lustre_version_code $SINGLEMDS) local mds_journal_size_orig=$MDSJOURNALSIZE local n @@ -4313,9 +4338,9 @@ test_56a() { echo ok $LFS osts - if [[ $server_version -ge $(version_code 2.6.54) ]] || - [[ $server_version -ge $(version_code 2.5.4) && - $server_version -lt $(version_code 2.5.11) ]]; then + if [[ "$MDS1_VERSION" -ge $(version_code 2.6.54) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.5.4) && + "$MDS1_VERSION" -lt $(version_code 2.5.11) ]]; then wait_osc_import_state mds ost1 FULL wait_osc_import_state mds ost2 FULL $LFS setstripe --stripe-count=-1 $DIR/$tfile || @@ -4433,7 +4458,7 @@ test_57a() { # bug 22656 local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}') writeconf_or_reformat - [ $(facet_fstype ost1) == zfs ] && import_zpool ost1 + [ "$ost1_FSTYPE" == zfs ] && import_zpool ost1 do_facet ost1 "$TUNEFS --failnode=$NID `ostdevname 1`" || error "tunefs failed" start_mgsmds @@ -4447,7 +4472,7 @@ test_57b() { local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}') writeconf_or_reformat - [ $(facet_fstype ost1) == zfs ] && import_zpool ost1 + [ "$ost1_FSTYPE" == zfs ] && import_zpool ost1 do_facet ost1 "$TUNEFS --servicenode=$NID `ostdevname 1`" || error "tunefs failed" start_mgsmds @@ -4518,7 +4543,7 @@ test_59() { run_test 59 "writeconf mount option" test_60() { # LU-471 - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4548,10 +4573,10 @@ run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting" test_61() { # LU-80 local lxattr=$(large_xattr_enabled) - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.1.53) ] || + [ "$MDS1_VERSION" -ge $(version_code 2.1.53) ] || skip "Need MDS version at least 2.1.53" - if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && + if [ "$mds1_FSTYPE" == ldiskfs ] && ! large_xattr_enabled; then lxattr=true @@ -4605,7 +4630,7 @@ test_61() { # LU-80 log "remove large xattr $name from $file" setfattr -x $name $file || error "removing $name from $file failed" - if $lxattr && [ $(facet_fstype $SINGLEMDS) == ldiskfs ]; then + if $lxattr && [ "$mds1_FSTYPE" == ldiskfs ]; then stopall || error "stopping for e2fsck run" for num in $(seq $MDSCOUNT); do run_e2fsck $(facet_active_host mds$num) \ @@ -4622,10 +4647,10 @@ test_61() { # LU-80 run_test 61 "large xattr" test_62() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.2.51) ]] || skip "Need MDS version at least 2.2.51" # MRP-118 @@ -4644,7 +4669,7 @@ test_62() { run_test 62 "start with disabled journal" test_63() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -4686,7 +4711,7 @@ run_test 64 "check lfs df --lazy " test_65() { # LU-2237 # Currently, the test is only valid for ldiskfs backend - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + [ "$mds1_FSTYPE" != ldiskfs ] && skip "ldiskfs only test" local devname=$(mdsdevname ${SINGLEMDS//mds/}) @@ -4711,7 +4736,7 @@ test_65() { # LU-2237 # remove the "last_rcvd" file do_facet $SINGLEMDS "mkdir -p $brpt" do_facet $SINGLEMDS \ - "mount -t $(facet_fstype $SINGLEMDS) $opts $devname $brpt" + "mount -t $mds1_FSTYPE $opts $devname $brpt" do_facet $SINGLEMDS "rm -f ${brpt}/last_rcvd" do_facet $SINGLEMDS "$UMOUNT $brpt" @@ -4725,7 +4750,7 @@ test_65() { # LU-2237 run_test 65 "re-create the lost last_rcvd file when server mount" test_66() { - [[ $(lustre_version_code mgs) -ge $(version_code 2.3.59) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.3.59) ]] || skip "Need MGS version at least 2.3.59" setup @@ -4882,7 +4907,7 @@ test_68() { local START local END - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.53) ] || + [ "$MDS1_VERSION" -ge $(version_code 2.4.53) ] || skip "Need MDS version at least 2.4.53" umount_client $MOUNT || error "umount client failed" @@ -4927,13 +4952,11 @@ run_test 68 "be able to reserve specific sequences in FLDB" # just "precreate" the missing objects. In the past it might try to recreate # millions of objects after an OST was reformatted test_69() { - local server_version=$(lustre_version_code $SINGLEMDS) - - [[ $server_version -lt $(version_code 2.4.2) ]] && + [[ "$MDS1_VERSION" -lt $(version_code 2.4.2) ]] && skip "Need MDS version at least 2.4.2" - [[ $server_version -ge $(version_code 2.4.50) ]] && - [[ $server_version -lt $(version_code 2.5.0) ]] && + [[ "$MDS1_VERSION" -ge $(version_code 2.4.50) ]] && + [[ "$MDS1_VERSION" -lt $(version_code 2.5.0) ]] && skip "Need MDS version at least 2.5.0" setup @@ -5103,7 +5126,7 @@ run_test 70d "stop MDT1, mkdir succeed, create remote dir fail" test_70e() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.7.62) ] || + [ "$MDS1_VERSION" -ge $(version_code 2.7.62) ] || skip "Need MDS version at least 2.7.62" reformat || error "reformat failed with $?" @@ -5312,7 +5335,7 @@ test_71e() { run_test 71e "start OST0, MDT1, OST1, MDT0" test_72() { #LU-2634 - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + [ "$mds1_FSTYPE" != ldiskfs ] && skip "ldiskfs only test" local mdsdev=$(mdsdevname 1) @@ -5366,7 +5389,7 @@ test_72() { #LU-2634 run_test 72 "test fast symlink with extents flag enabled" test_73() { #LU-3006 - [ $(facet_fstype ost1) == zfs ] && import_zpool ost1 + [ "$ost1_FSTYPE" == zfs ] && import_zpool ost1 do_facet ost1 "$TUNEFS --failnode=1.2.3.4@$NETTYPE $(ostdevname 1)" || error "1st tunefs failed" start_mgsmds || error "start mds failed" @@ -5381,7 +5404,7 @@ test_73() { #LU-3006 run_test 73 "failnode to update from mountdata properly" test_75() { # LU-2374 - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] && + [[ "$MDS1_VERSION" -lt $(version_code 2.4.1) ]] && skip "Need MDS version at least 2.4.1" local index=0 @@ -5410,7 +5433,7 @@ test_75() { # LU-2374 run_test 75 "The order of --index should be irrelevant" test_76a() { - [[ $(lustre_version_code mgs) -ge $(version_code 2.4.52) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.4.52) ]] || skip "Need MDS version at least 2.4.52" setup @@ -5470,7 +5493,7 @@ test_76a() { run_test 76a "set permanent params with lctl across mounts" test_76b() { # LU-4783 - [[ $(lustre_version_code mgs) -ge $(version_code 2.5.57) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.5.57) ]] || skip "Need MGS version at least 2.5.57" stopall setupall @@ -5481,7 +5504,7 @@ test_76b() { # LU-4783 run_test 76b "verify params log setup correctly" test_76c() { - [[ $(lustre_version_code mgs) -ge $(version_code 2.8.54) ]] || + [[ "$MGS_VERSION" -ge $(version_code 2.8.54) ]] || skip "Need MDS version at least 2.4.52" setupall local MASK_PARAM="mdd.*.changelog_mask" @@ -5531,8 +5554,7 @@ test_76d() { #LU-9399 run_test 76d "verify llite.*.xattr_cache can be set by 'lctl set_param -P' correctly" test_77() { # LU-3445 - local server_version=$(lustre_version_code $SINGLEMDS) - [[ $server_version -ge $(version_code 2.8.55) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.8.55) ]] || skip "Need MDS version 2.8.55+ " if [[ -z "$fs2ost_DEV" || -z "$fs2mds_DEV" ]]; then @@ -5572,8 +5594,8 @@ test_77() { # LU-3445 run_test 77 "comma-separated MGS NIDs and failover node NIDs" test_78() { - [[ $(facet_fstype $SINGLEMDS) != ldiskfs || - $(facet_fstype ost1) != ldiskfs ]] && + [[ "$mds1_FSTYPE" != ldiskfs || + "$ost1_FSTYPE" != ldiskfs ]] && skip "ldiskfs only test" # reformat the Lustre filesystem with a smaller size @@ -5737,7 +5759,7 @@ test_78() { run_test 78 "run resize2fs on MDT and OST filesystems" test_79() { # LU-4227 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.5.59) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.5.59) ]] || skip "Need MDS version at least 2.5.59" local mdsdev1=$(mdsdevname 1) @@ -5757,13 +5779,13 @@ test_79() { # LU-4227 mgsnode_opt=$(echo $opts_mds2 | awk '{ for ( i = 1; i < NF; i++ ) if ( $i ~ "--mgsnode" ) { print $i; break } }') - [ -n $mgsnode_opt ] && + [ -n "$mgsnode_opt" ] && opts_mds2=$(echo $opts_mds2 | sed -e "s/$mgsnode_opt//") mgsnode_opt=$(echo $opts_ost1 | awk '{ for ( i = 1; i < NF; i++ ) if ( $i ~ "--mgsnode" ) { print $i; break } }') - [ -n $mgsnode_opt ] && + [ -n "$mgsnode_opt" ] && opts_ost1=$(echo $opts_ost1 | sed -e "s/$mgsnode_opt//") load_modules # -MGS, format a mdt without --mgs option @@ -5837,7 +5859,7 @@ restore_ostindex() { # expected. This test uses OST_INDEX_LIST to format OSTs with a randomly # assigned index and ensures we can mount such a formatted file system test_81() { # LU-4665 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.6.54) ]] || skip "Need MDS version at least 2.6.54" [[ $OSTCOUNT -ge 3 ]] || skip_env "needs >= 3 OSTs" @@ -5877,22 +5899,15 @@ test_81() { # LU-4665 # Check max_easize. local max_easize=$($LCTL get_param -n llite.*.max_easize) - if [ $MDS1_VERSION -lt $(version_code 2.12.51) ] - then - [[ $max_easize -eq 128 ]] || - error "max_easize is $max_easize, should be 128 bytes" + # 65452 is XATTR_SIZE_MAX less ldiskfs ea overhead + if large_xattr_enabled; then + [[ $max_easize -ge 65452 ]] || + error "max_easize is $max_easize, should be at least 65452 bytes" else # LU-11868 - # 4012 is 4096 - ldiskfs ea overhead + # 4012 is 4096 less ldiskfs ea overhead [[ $max_easize -ge 4012 ]] || - error "max_easize is $max_easize, should be at least 4012 bytes" - - # 65452 is XATTR_SIZE_MAX - ldiskfs ea overhead - if large_xattr_enabled; - then - [[ $max_easize -ge 65452 ]] || - error "max_easize is $max_easize, should be at least 65452 bytes" - fi + error "max_easize is $max_easize, should be at least 4012 bytes" fi restore_ostindex @@ -5914,7 +5929,7 @@ run_test 81 "sparse OST indexing" # # 5. Lastly ensure this functionality fails with directories. test_82a() { # LU-4665 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.6.54) ]] || skip "Need MDS version at least 2.6.54" [[ $OSTCOUNT -ge 3 ]] || skip_env "needs >= 3 OSTs" @@ -6007,8 +6022,8 @@ test_82a() { # LU-4665 local dir=$DIR/$tdir/$tdir mkdir $dir || error "mkdir $dir failed" cmd="$LFS setstripe -o $ost_indices $dir" - if [[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.11.53) && - $(lustre_version_code client -gt $(version_code 2.11.53)) ]]; then + if [ "$MDS1_VERSION" -gt $(version_code 2.11.53) ] && + [ "$CLIENT_VERSION" -gt $(version_code 2.11.53) ]; then echo -e "\n$cmd" eval $cmd || error "unable to specify OST indices on directory" else @@ -6025,9 +6040,6 @@ cleanup_82b() { # Remove OSTs from a pool and destroy the pool. destroy_pool $ost_pool || true - if ! combined_mgs_mds ; then - umount_mgs_client - fi restore_ostindex } @@ -6036,7 +6048,7 @@ cleanup_82b() { # the supplied OST index list points to OSTs not contained in the user # supplied pool. test_82b() { # LU-4665 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.6.54) ]] || skip "Need MDS version at least 2.6.54" [[ $OSTCOUNT -ge 4 ]] || skip_env "needs >= 4 OSTs" @@ -6067,9 +6079,6 @@ test_82b() { # LU-4665 done mount_client $MOUNT || error "mount client $MOUNT failed" - if ! combined_mgs_mds ; then - mount_mgs_client - fi wait_osts_up $LFS df $MOUNT || error "$LFS df $MOUNT failed" @@ -6130,9 +6139,9 @@ test_82b() { # LU-4665 run_test 82b "specify OSTs for file with --pool and --ost-list options" test_83() { - [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.6.91) ]] || skip "Need OST version at least 2.6.91" - if [ $(facet_fstype ost1) != ldiskfs ]; then + if [ "$ost1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -6143,25 +6152,24 @@ test_83() { dev=$(ostdevname 1) ostmnt=$(facet_mntpt ost1) - fstype=$(facet_fstype ost1) # Mount the OST as an ldiskfs filesystem. - log "mount the OST $dev as a $fstype filesystem" + log "mount the OST $dev as a $ost1_FSTYPE filesystem" add ost1 $(mkfs_opts ost1 $dev) $FSTYPE_OPT \ --reformat $dev > /dev/null || error "format ost1 error" if ! test -b $dev; then - mnt_opts=$(csa_add "$OST_MOUNT_OPTS" -o loop) + mnt_opts=$(csa_add "$OST_MOUNT_FS_OPTS" -o loop) fi echo "mnt_opts $mnt_opts" - do_facet ost1 mount -t $fstype $dev \ + do_facet ost1 mount -t "$ost1_FSTYPE" $dev \ $ostmnt $mnt_opts # Run llverfs on the mounted ldiskfs filesystem. # It is needed to get ENOSPACE. - log "run llverfs in partial mode on the OST $fstype $ostmnt" + log "run llverfs in partial mode on the OST $ost1_FSTYPE $ostmnt" do_rpc_nodes $(facet_host ost1) run_llverfs $ostmnt -vpl \ - "no" || error "run_llverfs error on $fstype" + "no" || error "run_llverfs error on $ost1_FSTYPE" # Unmount the OST. log "unmount the OST $dev" @@ -6247,7 +6255,7 @@ test_84() { run_test 84 "check recovery_hard_time" test_85() { - [[ $(lustre_version_code ost1) -ge $(version_code 2.7.55) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.7.55) ]] || skip "Need OST version at least 2.7.55" ##define OBD_FAIL_OSD_OST_EA_FID_SET 0x197 do_facet ost1 "lctl set_param fail_loc=0x197" @@ -6266,10 +6274,9 @@ cleanup_86() { } test_86() { - local server_version=$(lustre_version_code $SINGLEMDS) - [ "$(facet_fstype ost1)" = "zfs" ] && + [ "$ost1_FSTYPE" = zfs ] && skip "LU-6442: no such mkfs params for ZFS OSTs" - [[ $server_version -ge $(version_code 2.7.56) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.7.56) ]] || skip "Need server version newer than 2.7.55" local OST_OPTS="$(mkfs_opts ost1 $(ostdevname 1)) \ @@ -6307,12 +6314,13 @@ test_86() { run_test 86 "Replacing mkfs.lustre -G option" test_87() { #LU-6544 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.9.51) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.9.51) ]] || skip "Need MDS version at least 2.9.51" - [[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] && + [[ "$mds1_FSTYPE" != ldiskfs ]] && skip "ldiskfs only test" [[ $OSTCOUNT -gt 59 ]] && skip "Ignore wide striping situation" + [ -n "$FILESET" ] && skip "Not functional for FILESET set" local mdsdev=$(mdsdevname 1) local mdsvdev=$(mdsvdevname 1) @@ -6391,7 +6399,7 @@ test_87() { #LU-6544 more than $left_size-byte space left in inode." echo "Verified: at most $left_size-byte space left in inode." - umount_ldiskfs $SINGLEMDS + unmount_ldiskfs $SINGLEMDS for i in $(seq $OSTCOUNT); do stop ost$i -f || error "stop ost$i failed" @@ -6400,7 +6408,7 @@ test_87() { #LU-6544 run_test 87 "check if MDT inode can hold EAs with N stripes properly" test_88() { - [ "$(facet_fstype mds1)" == "zfs" ] && + [ "$mds1_FSTYPE" == zfs ] && skip "LU-6662: no implementation for ZFS" load_modules @@ -6423,7 +6431,7 @@ test_88() { run_test 88 "check the default mount options can be overridden" test_89() { # LU-7131 - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.9.54) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.9.54) ]] || skip "Need MDT version at least 2.9.54" local key=failover.node @@ -6434,7 +6442,7 @@ test_89() { # LU-7131 stopall - [ $(facet_fstype mds1) == zfs ] && import_zpool mds1 + [ "$mds1_FSTYPE" == zfs ] && import_zpool mds1 # Check that parameters are added correctly echo "tunefs --param $key=$val1" do_facet mds "$TUNEFS --param $key=$val1 $mdsdev >/dev/null" || @@ -6652,10 +6660,41 @@ test_90b() { } run_test 90b "check max_mod_rpcs_in_flight is enforced after update" +save_params_90c() { + # get max_rpcs_in_flight value + mrif_90c=$($LCTL get_param -n \ + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight) + echo "max_rpcs_in_flight is $mrif_90c" + + # get max_mod_rpcs_in_flight value + mmrif_90c=$($LCTL get_param -n \ + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight) + echo "max_mod_rpcs_in_flight is $mmrif_90c" + + # get MDT max_mod_rpcs_per_client value + mmrpc_90c=$(do_facet mds1 \ + cat /sys/module/mdt/parameters/max_mod_rpcs_per_client) + echo "max_mod_rpcs_per_client is $mmrpc_90c" +} + +restore_params_90c() { + trap 0 + + # restore max_rpcs_in_flight value + do_facet mgs $LCTL set_param -P \ + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight=$mrif_90c + + # restore max_mod_rpcs_in_flight value + do_facet mgs $LCTL set_param -P \ + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$mmrif_90c + + # restore MDT max_mod_rpcs_per_client value + do_facet mds1 "echo $mmrpc_90c > \ + /sys/module/mdt/parameters/max_mod_rpcs_per_client" +} + test_90c() { local tmp - local mrif - local mmrpc setup @@ -6671,42 +6710,64 @@ test_90c() { skip "Client not able to send multiple modify RPCs in parallel" fi - # get max_rpcs_in_flight value - mrif=$($LCTL get_param -n mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight) - echo "max_rpcs_in_flight is $mrif" - - # get MDT max_mod_rpcs_per_client - mmrpc=$(do_facet mds1 \ - cat /sys/module/mdt/parameters/max_mod_rpcs_per_client) - echo "max_mod_rpcs_per_client is $mmrpc" + save_params_90c + stack_trap restore_params_90c # testcase 1 # attempt to set max_mod_rpcs_in_flight to max_rpcs_in_flight value # prerequisite: set max_mod_rpcs_per_client to max_rpcs_in_flight value - umount_client $MOUNT - do_facet mds1 \ - "echo $mrif > /sys/module/mdt/parameters/max_mod_rpcs_per_client" - mount_client $MOUNT + do_facet mds1 "echo $mrif_90c > \ + /sys/module/mdt/parameters/max_mod_rpcs_per_client" - $LCTL set_param \ - mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$mrif && - error "set max_mod_rpcs_in_flight to $mrif should fail" + # if max_mod_rpcs_in_flight is set to be equal to or larger than + # max_rpcs_in_flight, then max_rpcs_in_flight will be increased + if [[ "$CLIENT_VERSION" -ge $(version_code 2.13.53) ]]; then + $LCTL set_param \ + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$mrif_90c || + error "set max_mod_rpcs_in_flight to $mrif_90c failed" + + local new_mrif=$($LCTL get_param -n \ + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight) + ((new_mrif == mrif_90c + 1)) || + error "max_rpcs_in_flight was not increased" + fi umount_client $MOUNT - do_facet mds1 \ - "echo $mmrpc > /sys/module/mdt/parameters/max_mod_rpcs_per_client" + do_facet mds1 "echo $mmrpc_90c > \ + /sys/module/mdt/parameters/max_mod_rpcs_per_client" mount_client $MOUNT # testcase 2 # attempt to set max_mod_rpcs_in_flight to max_mod_rpcs_per_client+1 # prerequisite: set max_rpcs_in_flight to max_mod_rpcs_per_client+2 $LCTL set_param \ - mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight=$((mmrpc + 2)) + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight=$((mmrpc_90c + 2)) $LCTL set_param \ - mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$((mmrpc + 1)) && - error "set max_mod_rpcs_in_flight to $((mmrpc + 1)) should fail" + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$((mmrpc_90c + 1)) && + error "set max_mod_rpcs_in_flight to $((mmrpc_90c + 1)) should fail" + + # testcase 3 + # attempt to set max_mod_rpcs_in_flight permanently + do_facet mgs $LCTL set_param -P \ + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight=$mrif_90c + + do_facet mgs $LCTL set_param -P \ + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$mrif_90c + + remount_client $MOUNT + + wait_update_facet --verbose client "$LCTL get_param -n \ + mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight" \ + "$((mrif_90c + 1))" || + error "expected '$((mrif_90c + 1))' for max_rpcs_in_flight" + wait_update_facet --verbose client "$LCTL get_param -n \ + mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight" \ + "$mrif_90c" || + error "expected '$mrif_90c' for max_mod_rpcs_in_flight" + + restore_params_90c cleanup } run_test 90c "check max_mod_rpcs_in_flight update limits" @@ -6794,9 +6855,9 @@ test_91() { local nid local found - [[ $(lustre_version_code ost1) -ge $(version_code 2.7.63) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.7.63) ]] || skip "Need OST version at least 2.7.63" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.7.63) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.7.63) ]] || skip "Need MDT version at least 2.7.63" start_mds || error "MDS start failed" @@ -6855,7 +6916,7 @@ generate_ldev_conf() { touch $ldevconfpath fstype=$(facet_fstype mgs) - if [ "$fstype" == "zfs" ]; then + if [ "$fstype" == zfs ]; then fsldevformat="$fstype:" else fsldevformat="" @@ -6874,7 +6935,7 @@ generate_ldev_conf() { for num in $(seq $MDSCOUNT); do fstype=$(facet_fstype mds$num) - if [ "$fstype" == "zfs" ]; then + if [ "$fstype" == zfs ]; then fsldevformat="$fstype:" else fsldevformat="" @@ -6896,7 +6957,7 @@ generate_ldev_conf() { for num in $(seq $OSTCOUNT); do fstype=$(facet_fstype ost$num) - if [ "$fstype" == "zfs" ]; then + if [ "$fstype" == zfs ]; then fsldevformat="$fstype:" else fsldevformat="" @@ -7286,7 +7347,7 @@ test_98() for ((x = 1; x <= 400; x++)); do mountopt="$mountopt,user_xattr" done - remount_client $mountopt $MOUNT 2>&1 | grep "too long" || + mount_client $MOUNT remount,$mountopt 2>&1 | grep "too long" || error "Buffer overflow check failed" cleanup || error "cleanup failed" } @@ -7294,9 +7355,9 @@ run_test 98 "Buffer-overflow check while parsing mount_opts" test_99() { - [[ $(facet_fstype ost1) != ldiskfs ]] && + [[ "$ost1_FSTYPE" != ldiskfs ]] && skip "ldiskfs only test" - [[ $(lustre_version_code ost1) -ge $(version_code 2.8.57) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.8.57) ]] || skip "Need OST version at least 2.8.57" local ost_opts="$(mkfs_opts ost1 $(ostdevname 1)) \ @@ -7335,9 +7396,9 @@ test_100() { # Desired output # MGS: # 0@lo - # lustre-MDT0000: + # $FSNAME-MDT0000: # 0@lo - # lustre-OST0000: + # $FSNAME-OST0000: # 0@lo do_facet mgs 'lshowmount -v' | awk 'BEGIN {NR == 0; rc=1} /MGS:/ {rc=0} END {exit rc}' || error "lshowmount have no output MGS" @@ -7382,7 +7443,7 @@ test_101() { run_test 101 "Race MDT->OST reconnection with create" test_102() { - [[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.9.53) ]] || + [[ "$MDS1_VERSION" -gt $(version_code 2.9.53) ]] || skip "Need server version greater than 2.9.53" [[ “$(mdsdevname 1)” != “$(mgsdevname)” ]] && [[ “$(facet_host mds1)” = “$(facet_host mgs)” ]] && @@ -7392,14 +7453,13 @@ test_102() { local mds1dev=$(mdsdevname 1) local mds1mnt=$(facet_mntpt mds1) - local mds1fstype=$(facet_fstype mds1) local mds1opts=$MDS_MOUNT_OPTS - if [ $mds1fstype == ldiskfs ] && + if [ "$mds1_FSTYPE" == ldiskfs ] && ! do_facet mds1 test -b $mds1dev; then mds1opts=$(csa_add "$mds1opts" -o loop) fi - if [[ $mds1fstype == zfs ]]; then + if [[ "$mds1_FSTYPE" == zfs ]]; then import_zpool mds1 || return ${PIPESTATUS[0]} fi @@ -7430,34 +7490,34 @@ test_renamefs() { echo "rename $FSNAME to $newname" if ! combined_mgs_mds ; then - local facet=$(mgsdevname) + local dev=$(mgsdevname) do_facet mgs \ - "$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"|| - error "(7) Fail to rename MGS" - if [ "$(facet_fstype $facet)" = "zfs" ]; then + "$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" || + error "(7) Fail to rename MGS" + if [ "$(facet_fstype mgs)" = "zfs" ]; then reimport_zpool mgs $newname-mgs fi fi for num in $(seq $MDSCOUNT); do - local facet=$(mdsdevname $num) + local dev=$(mdsdevname $num) do_facet mds${num} \ - "$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"|| - error "(8) Fail to rename MDT $num" - if [ "$(facet_fstype $facet)" = "zfs" ]; then + "$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" || + error "(8) Fail to rename MDT $num" + if [ "$(facet_fstype mds${num})" = "zfs" ]; then reimport_zpool mds${num} $newname-mdt${num} fi done for num in $(seq $OSTCOUNT); do - local facet=$(ostdevname $num) + local dev=$(ostdevname $num) do_facet ost${num} \ - "$TUNEFS --fsname=$newname --rename=$FSNAME -v $facet"|| - error "(9) Fail to rename OST $num" - if [ "$(facet_fstype $facet)" = "zfs" ]; then + "$TUNEFS --fsname=$newname --rename=$FSNAME -v $dev" || + error "(9) Fail to rename OST $num" + if [ "$(facet_fstype ost${num})" = "zfs" ]; then reimport_zpool ost${num} $newname-ost${num} fi done @@ -7501,9 +7561,6 @@ test_103() { cp $LUSTRE/tests/test-framework.sh $DIR/$tdir || error "(2) Fail to copy test-framework.sh" - if ! combined_mgs_mds ; then - mount_mgs_client - fi do_facet mgs $LCTL pool_new $FSNAME.pool1 || error "(3) Fail to create $FSNAME.pool1" # name the pool name as the fsname @@ -7515,9 +7572,6 @@ test_103() { $LFS setstripe -p $FSNAME $DIR/$tdir/d0 || error "(6) Fail to setstripe on $DIR/$tdir/d0" - if ! combined_mgs_mds ; then - umount_mgs_client - fi KEEP_ZPOOL=true stopall @@ -7527,9 +7581,6 @@ test_103() { FSNAME="mylustre" setupall - if ! combined_mgs_mds ; then - mount_mgs_client - fi test_103_check_pool $save_fsname 7 if [ $OSTCOUNT -ge 2 ]; then @@ -7538,9 +7589,6 @@ test_103() { $LFS setstripe -p $save_fsname $DIR/$tdir/f0 || error "(16) Fail to setstripe on $DIR/$tdir/f0" - if ! combined_mgs_mds ; then - umount_mgs_client - fi stopall @@ -7549,14 +7597,8 @@ test_103() { FSNAME="tfs" setupall - if ! combined_mgs_mds ; then - mount_mgs_client - fi test_103_check_pool $save_fsname 17 - if ! combined_mgs_mds ; then - umount_mgs_client - fi stopall test_renamefs $save_fsname @@ -7567,7 +7609,7 @@ test_103() { } run_test 103 "rename filesystem name" -test_104() { # LU-6952 +test_104a() { # LU-6952 local mds_mountopts=$MDS_MOUNT_OPTS local ost_mountopts=$OST_MOUNT_OPTS local mds_mountfsopts=$MDS_MOUNT_FS_OPTS @@ -7617,7 +7659,22 @@ test_104() { # LU-6952 OST_MOUNT_OPTS=$ost_mountopts MDS_MOUNT_FS_OPTS=$mds_mountfsopts } -run_test 104 "Make sure user defined options are reflected in mount" +run_test 104a "Make sure user defined options are reflected in mount" + +test_104b() { # LU-12859 + mount_client $MOUNT3 flock,localflock + stack_trap "umount_client $MOUNT3" EXIT + mount | grep "$MOUNT3 .*,flock" && error "flock is still set" + mount | grep "$MOUNT3 .*,localflock" || error "localflock is not set" + umount_client $MOUNT3 + mount_client $MOUNT3 localflock,flock + mount | grep "$MOUNT3 .*,localflock" && error "localflock is still set" + mount | grep "$MOUNT3 .*,flock" || error "flock is not set" + umount_client $MOUNT3 + mount_client $MOUNT3 localflock,flock,noflock + flock_is_enabled $MOUNT3 && error "some flock is still enabled" || true +} +run_test 104b "Mount uses last flock argument" error_and_umount() { umount $TMP/$tdir @@ -7684,7 +7741,7 @@ test_106() { run_test 106 "check osp llog processing when catalog is wrapped" test_107() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.50) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.10.50) ]] || skip "Need MDS version > 2.10.50" local cmd @@ -7715,7 +7772,7 @@ t_108_prep() { $rcmd mkdir -p $tmp/{mnt,images} || error "failed to mkdir remotely" for facet in $facets; do - [ $(facet_fstype $SINGLEMDS) = "zfs" ] && + [ "$mds1_FSTYPE" = zfs ] && $rcmd $ZPOOL -f export lustre-$facet > /dev/null 2>&1 $rcmd mkdir $tmp/mnt/$facet || error "failed to mkdir $tmp/mnt/$facet" @@ -7783,7 +7840,7 @@ t_108_cleanup() { for facet in $facets; do $rcmd umount -f $tmp/mnt/$facet || error "failed to umount $facet" - if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then + if [ "$mds1_FSTYPE" = zfs ]; then $rcmd $ZPOOL export -f lustre-$facet || error "failed to export lustre-$facet" fi @@ -7794,8 +7851,8 @@ t_108_cleanup() { test_108a() { [ "$CLIENTONLY" ] && skip "Client-only testing" - [ $(facet_fstype $SINGLEMDS) != "zfs" ] && skip "zfs only test" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.58) ] && + [ "$mds1_FSTYPE" != zfs ] && skip "zfs only test" + [ "$MDS1_VERSION" -lt $(version_code 2.10.58) ] && skip "Need server version at least 2.10.58" stopall @@ -7835,10 +7892,10 @@ test_108a() { echo "changing server nid..." $rcmd mount -t lustre -o nosvc lustre-mdt1/mdt1 $tmp/mnt/mdt1 - $rcmd lctl replace_nids lustre-MDT0000 $nid - $rcmd lctl replace_nids lustre-MDT0001 $nid - $rcmd lctl replace_nids lustre-OST0000 $nid - $rcmd lctl replace_nids lustre-OST0001 $nid + $rcmd lctl replace_nids $FSNAME-MDT0000 $nid + $rcmd lctl replace_nids $FSNAME-MDT0001 $nid + $rcmd lctl replace_nids $FSNAME-OST0000 $nid + $rcmd lctl replace_nids $FSNAME-OST0001 $nid $rcmd umount $tmp/mnt/mdt1 for facet in $facets; do @@ -7858,8 +7915,8 @@ run_test 108a "migrate from ldiskfs to ZFS" test_108b() { [ "$CLIENTONLY" ] && skip "Client-only testing" - [ $(facet_fstype $SINGLEMDS) != "ldiskfs" ] && skip "ldiskfs only test" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.58) ] && + [ "$mds1_FSTYPE" != ldiskfs ] && skip "ldiskfs only test" + [ "$MDS1_VERSION" -lt $(version_code 2.10.58) ] && skip "Need server version at least 2.10.58" stopall @@ -7897,10 +7954,10 @@ test_108b() { echo "changing server nid..." $rcmd mount -t lustre -o nosvc,loop $tmp/images/mdt1 $tmp/mnt/mdt1 - $rcmd lctl replace_nids lustre-MDT0000 $nid - $rcmd lctl replace_nids lustre-MDT0001 $nid - $rcmd lctl replace_nids lustre-OST0000 $nid - $rcmd lctl replace_nids lustre-OST0001 $nid + $rcmd lctl replace_nids $FSNAME-MDT0000 $nid + $rcmd lctl replace_nids $FSNAME-MDT0001 $nid + $rcmd lctl replace_nids $FSNAME-OST0000 $nid + $rcmd lctl replace_nids $FSNAME-OST0001 $nid $rcmd umount $tmp/mnt/mdt1 for facet in $facets; do @@ -7910,7 +7967,7 @@ test_108b() { done for facet in $scrub_list; do - $rcmd $LCTL lfsck_start -M lustre-$facet -t scrub || + $rcmd $LCTL lfsck_start -M $FSNAME-$facet -t scrub || error "failed to start OI scrub on $facet" done @@ -8023,25 +8080,19 @@ test_109a() { [ $MDS1_VERSION -lt $(version_code 2.10.59) ] && skip "Needs MDS version 2.10.59 or later." - [ "$(facet_fstype mgs)" == "zfs" ] && + [ "$(facet_fstype mgs)" == zfs ] && skip "LU-8727: no implementation for ZFS" stopall reformat setup_noconfig client_up || error "client_up failed" - #pool commands requires a client on MGS for procfs interfaces - if ! combined_mgs_mds ; then - mount_mgs_client - stack_trap umount_mgs_client EXIT - fi # # set number of permanent parameters # test_109_set_params $FSNAME - combined_mgs_mds || umount_mgs_client umount_client $MOUNT || error "umount_client failed" stop_ost || error "stop_ost failed" stop_mds || error "stop_mds failed" @@ -8056,7 +8107,6 @@ test_109a() error "failed to clear client config" setup_noconfig - combined_mgs_mds || mount_mgs_client # # check that configurations are intact @@ -8068,7 +8118,6 @@ test_109a() # destroy_test_pools || error "destroy test pools failed" - combined_mgs_mds || umount_mgs_client cleanup } run_test 109a "test lctl clear_conf fsname" @@ -8077,25 +8126,19 @@ test_109b() { [ $MDS1_VERSION -lt $(version_code 2.10.59) ] && skip "Needs MDS version 2.10.59 or later." - [ "$(facet_fstype mgs)" == "zfs" ] && + [ "$(facet_fstype mgs)" == zfs ] && skip "LU-8727: no implementation for ZFS" stopall reformat setup_noconfig client_up || error "client_up failed" - #pool commands requires a client on MGS for procfs interfaces - if ! combined_mgs_mds ; then - mount_mgs_client - stack_trap umount_mgs_client EXIT - fi # # set number of permanent parameters # test_109_set_params $FSNAME - combined_mgs_mds || umount_mgs_client umount_client $MOUNT || error "umount_client failed" stop_ost || error "stop_ost failed" stop_mds || error "stop_mds failed" @@ -8110,7 +8153,6 @@ test_109b() error "failed to clear client config" setup_noconfig - combined_mgs_mds || mount_mgs_client # # check that configurations are intact # @@ -8121,14 +8163,13 @@ test_109b() # destroy_test_pools || error "destroy test pools failed" - combined_mgs_mds || umount_mgs_client cleanup } run_test 109b "test lctl clear_conf one config" test_110() { - [[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] && + [[ "$mds1_FSTYPE" != ldiskfs ]] && skip "Only applicable to ldiskfs-based MDTs" do_facet $SINGLEMDS $DEBUGFS -w -R supported_features |grep large_dir || @@ -8165,11 +8206,13 @@ test_110() combined_mgs_mds || replace=" --replace " local opts="$(mkfs_opts mds1 $(mdsdevname 1)) \ $replace --reformat $(mdsdevname 1) $(mdsvdevname 1)" - if [[ $opts != *mkfsoptions* ]]; then - opts+=" --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536\\\"" - else - opts="${opts//--mkfsoptions=\\\"/ \ - --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536 }" + if [[ $opts != *large_dir* ]]; then + if [[ $opts != *mkfsoptions* ]]; then + opts+=" --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536\\\"" + else + opts="${opts//--mkfsoptions=\\\"/ \ + --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536 }" + fi fi echo "MDT params: $opts" load_modules @@ -8180,11 +8223,13 @@ test_110() opts="$(mkfs_opts ost1 $(ostdevname 1)) \ $replace --reformat $(ostdevname 1) $(ostvdevname 1)" - if [[ $opts != *mkfsoptions* ]]; then - opts+=" --mkfsoptions=\\\"-O large_dir\\\" " - else - opts="${opts//--mkfsoptions=\\\"/ \ - --mkfsoptions=\\\"-O large_dir }" + if [[ $opts != *large_dir* ]]; then + if [[ $opts != *mkfsoptions* ]]; then + opts+=" --mkfsoptions=\\\"-O large_dir\\\" " + else + opts="${opts//--mkfsoptions=\\\"/ \ + --mkfsoptions=\\\"-O large_dir }" + fi fi echo "OST params: $opts" add ost1 $opts || error "add ost1 failed with new params" @@ -8225,7 +8270,7 @@ test_110() run_test 110 "Adding large_dir with 3-level htree" test_111() { - [[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] && + [[ "$mds1_FSTYPE" != ldiskfs ]] && skip "Only applicable to ldiskfs-based MDTs" is_dm_flakey_dev $SINGLEMDS $(mdsdevname 1) && @@ -8252,11 +8297,13 @@ test_111() { combined_mgs_mds || replace=" --replace " local opts="$(mkfs_opts mds1 $(mdsdevname 1)) \ $replace --reformat $(mdsdevname 1) $(mdsvdevname 1)" - if [[ $opts != *mkfsoptions* ]]; then - opts+=" --mkfsoptions=\\\"-O large_dir -i 1048576 \\\" " - else - opts="${opts//--mkfsoptions=\\\"/ \ - --mkfsoptions=\\\"-O large_dir -i 1048576 }" + if [[ $opts != *large_dir* ]]; then + if [[ $opts != *mkfsoptions* ]]; then + opts+=" --mkfsoptions=\\\"-O large_dir -i 1048576 \\\" " + else + opts="${opts//--mkfsoptions=\\\"/ \ + --mkfsoptions=\\\"-O large_dir -i 1048576 }" + fi fi echo "MDT params: $opts" load_modules @@ -8267,10 +8314,12 @@ test_111() { opts="$(mkfs_opts ost1 $(ostdevname 1)) \ $replace --reformat $(ostdevname 1) $(ostvdevname 1)" - if [[ $opts != *mkfsoptions* ]]; then - opts+=" --mkfsoptions=\\\"-O large_dir \\\"" - else - opts="${opts//--mkfsoptions=\\\"/ --mkfsoptions=\\\"-O large_dir }" + if [[ $opts != *large_dir* ]]; then + if [[ $opts != *mkfsoptions* ]]; then + opts+=" --mkfsoptions=\\\"-O large_dir \\\"" + else + opts="${opts//--mkfsoptions=\\\"/ --mkfsoptions=\\\"-O large_dir }" + fi fi echo "OST params: $opts" __touch_device ost 1 @@ -8344,23 +8393,66 @@ test_111() { } run_test 111 "Adding large_dir with over 2GB directory" +test_112() { + start_mds || error "MDS start failed" + start_ost || error "OSS start failed" + echo "start ost2 service on $(facet_active_host ost2)" + start ost2 $(ostdevname 2) $(csa_add "$OST_MOUNT_OPTS" -o no_precreate) || + error "start ost2 facet failed" + local val=$(do_facet ost2 \ + "$LCTL get_param -n obdfilter.$FSNAME-OST0001*.no_precreate") + (( $val == 1 )) || error "obdfilter.$FSNAME-OST0001*.no_precreate=$val" + + mount_client $MOUNT || error "mount client failed" + wait_osc_import_state client ost2 FULL + + $LFS setstripe -i 0 $DIR/$tfile.0 || + error "problem creating $tfile.0 on OST0000" + $LFS setstripe -i 1 $DIR/$tfile.1 && $LFS getstripe $DIR/$tfile.1 && + (( $($LFS getstripe -i $DIR/$tfile.1) == 1 )) && + error "allowed to create $tfile.1 on OST0001" + do_facet ost2 $LCTL set_param obdfilter.*.no_precreate=0 + sleep_maxage + $LFS setstripe -i 1 $DIR/$tfile.2 || + error "failed to create $tfile.2 on ost1 facet" + stop_ost2 || error "stop ost2 facet failed" + cleanup +} +run_test 112 "mount OST with nocreate option" cleanup_115() { trap 0 stopall rm -f $TMP/$tdir/lustre-mdt - reformat_and_config } test_115() { - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "Only applicable to ldiskfs-based MDTs" fi + [ -n "$FILESET" ] && skip "Not functional for FILESET set" + + local dbfs_ver=$(do_facet $SINGLEMDS $DEBUGFS -V 2>&1) + + echo "debugfs version: $dbfs_ver" + echo "$dbfs_ver" | egrep -w "1.44.3.wc1|1.44.5.wc1|1.45.2.wc1" && + skip_env "This version of debugfs doesn't show inode number" + + is_dm_flakey_dev $SINGLEMDS $(mdsdevname 1) && + skip "This test can not be executed on flakey dev" IMAGESIZE=$((3072 << 30)) # 3072 GiB stopall + + echo "client1: " + lctl dl + mount | grep lustre + echo "mds1: " + do_facet mds1 "hostname; ifconfig; lctl dl; mount" + echo "ost1: " + do_facet ost1 "hostname; ifconfig; lctl dl; mount" # We need MDT size 3072GB, because it is smallest # partition that can store 2B inodes do_facet $SINGLEMDS "mkdir -p $TMP/$tdir" @@ -8373,47 +8465,46 @@ test_115() { local mdsdev=$(do_facet $SINGLEMDS "losetup -f") do_facet $SINGLEMDS "losetup $mdsdev $mdsimgname" - local mds_opts="$(mkfs_opts mds1 ${mdsdev}) --device-size=$IMAGESIZE \ - --mkfsoptions='-O lazy_itable_init,ea_inode,^resize_inode,meta_bg \ - -i 1024'" + local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1)) \ + --mkfsoptions='-O ea_inode,^resize_inode,meta_bg \ + -N 2247484000 -E lazy_itable_init' --device-size=$IMAGESIZE" add mds1 $mds_opts --mgs --reformat $mdsdev || skip_env "format large MDT failed" - add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --index=$i \ - --reformat $(ostdevname 1) $(ostvdevname 1) - - start $SINGLEMDS ${mdsdev} $MDS_MOUNT_OPTS || error "start MDS failed" + opts="$(mkfs_opts ost1 $(ostdevname 1)) \ + $replace --reformat $(ostdevname 1) $(ostvdevname 1)" + add ost1 $opts || error "add ost1 failed with new params" + start $SINGLEMDS $mdsdev $MDS_MOUNT_OPTS || error "start MDS failed" start_ost || error "start OSS failed" mount_client $MOUNT || error "mount client failed" mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir fail" - for goal in $(do_facet $SINGLEMDS "ls /sys/fs/ldiskfs/*/inode_goal"); do - do_facet $SINGLEMDS "echo 2147483947 >> $goal; grep . $goal" - done - + goal="/sys/fs/ldiskfs/$(basename $mdsdev)/inode_goal" +echo goal: $goal + # 2147483648 is 0x80000000 + do_facet $SINGLEMDS "echo 2147483648 >> $goal; grep . $goal" touch $DIR/$tdir/$tfile - # Add > 5k bytes to xattr - for i in {1..30}; do - ln $DIR/$tdir/$tfile $DIR/$tdir/$(printf "link%0250d" $i) || - error "Can't make link" + # attrs from 1 to 15 go to block, 16th - to inode + for i in {1..16}; do + local nm="trusted.ea$i" + setfattr -n $nm -v $(printf "xattr%0250d" $i) $DIR/$tdir/$tfile done - sync; sleep 5; sync - + # inode <2147483649> trusted.ea16 (255) local inode_num=$(do_facet $SINGLEMDS \ - "$DEBUGFS -c -R 'stat ROOT/$tdir/$tfile' $mdsimgname" | - awk '/link =/ { print $4 }' | + "$DEBUGFS -c -R 'stat ROOT/$tdir/$tfile' $mdsdev" | + awk '/ea16/ { print $2 }' | sed -e 's/>//' -e 's/= 2 MDTs" - [[ $(lustre_version_code ost1) -ge $(version_code 2.11.53) ]] || + [[ "$OST1_VERSION" -ge $(version_code 2.11.53) ]] || skip "Need OST version at least 2.11.53" reformat @@ -8539,7 +8630,7 @@ test_123ab() { local orig_val orig_val=$(do_facet mgs $LCTL get_param jobid_name) - do_facet mgs $LCTL set_param -P jobid_name="testname" + do_facet mgs $LCTL set_param -P jobid_name="TESTNAME" yaml=$(do_facet mgs $LCTL --device MGS llog_print params | grep jobid_name | tail -n 1) @@ -8548,7 +8639,7 @@ test_123ab() { local val=$(awk '{ print $12 }' <<< "$yaml") #return to the default do_facet mgs $LCTL set_param -P jobid_name=$orig_val - [ $val = "testname" ] || error "bad value: $val" + [ $val = "TESTNAME" ] || error "bad value: $val" [ $param = "jobid_name," ] || error "Bad param: $param" } run_test 123ab "llog_print params output values from set_param -P" @@ -8631,7 +8722,7 @@ test_123ae() { # LU-11566 fi # test old positional parameters for a while still - if [ $(lustre_version_code mgs) -le $(version_code 3.1.53) ]; then + if [ "$MGS_VERSION" -le $(version_code 3.1.53) ]; then log=$FSNAME-client orig=$(do_facet mgs $LCTL --device MGS llog_print $log | tail -1 | awk '{ print $4 }' | tr -d , ) @@ -8653,6 +8744,55 @@ test_123ae() { # LU-11566 } run_test 123ae "llog_cancel can cancel requested record" +test_123af() { #LU-13609 + [ "$MGS_VERSION" -ge $(version_code 2.13.54) -a \ + "$MDS1_VERSION" -ge $(version_code 2.13.54) ] || + skip "Need both MGS and MDS version at least 2.13.54" + + [ -d $MOUNT/.lustre ] || setupall + stack_trap "do_facet mds1 $LCTL set_param fail_loc=0" EXIT + + local device + local facet + local cmd + local orig_clist + local orig_count + local new_clist + local new_count + + for device in "MGS" "$FSNAME-MDT0000"; do + cmd="--device $device llog_catlist" + echo "lctl $cmd ..." + if [ "$device" = "MGS" ]; then + facet="mgs" + else + facet="mds1" + fi + orig_clist=($(do_facet $facet $LCTL $cmd | awk '{ print $2 }')) + orig_count=${#orig_clist[@]} + echo "orig_clist: ${orig_clist[@]}" + + #define OBD_FAIL_CATLIST 0x131b + #fetch to llog records from the second one + do_facet $facet $LCTL set_param fail_loc=0x131b fail_val=2 + + new_clist=($(do_facet $facet $LCTL $cmd | awk '{ print $2 }')) + new_count=${#new_clist[@]} + echo "new_clist: ${new_clist[@]}" + + [ $new_count -eq $((orig_count - 1)) ] || + error "$new_count != $orig_count - 1" + for i in $(seq 0 $new_count); do + j=$((i + 1)) + [ "${orig_clist[$j]}" = "${new_clist[$i]}" ] || + error "${orig_clist[$j]} != ${new_clist[$i]}" + done + do_facet mds1 $LCTL set_param fail_loc=0 + echo "done" + done +} +run_test 123af "llog_catlist can show all config files correctly" + test_123F() { remote_mgs_nodsh && skip "remote MGS with nodsh" @@ -8664,7 +8804,7 @@ test_123F() { # set jobid_var to a different value for test local orig_val=$(do_facet mgs $LCTL get_param jobid_var) - do_facet mgs $LCTL set_param -P jobid_var="testname" + do_facet mgs $LCTL set_param -P jobid_var="TESTNAME" for i in $cfgfiles params; do do_facet mgs "lctl --device MGS llog_print ${i} >> $yaml_file" @@ -8687,8 +8827,8 @@ test_123F() { local set_val=$(do_facet mgs $LCTL get_param jobid_var) do_facet mgs $LCTL set_param -P $orig_val - [ $set_val == "jobid_var=testname" ] || - error "$set_val is not testname" + [ $set_val == "jobid_var=TESTNAME" ] || + error "$set_val is not TESTNAME" do_facet mgs rm "$yaml_file" cleanup @@ -8868,6 +9008,24 @@ test_125() } run_test 125 "check l_tunedisk only tunes OSTs and their slave devices" +test_126() { + [[ "$MDS1_VERSION" -ge $(version_code 2.13.52) ]] || + skip "Need MDS version at least 2.13.52" + + cleanup + do_rpc_nodes $(facet_active_host $SINGLEMDS) load_module ../libcfs/libcfs/libcfs + #define OBD_FAIL_OBD_SETUP 0x60d + do_facet mds1 $LCTL set_param fail_loc=0x60d + do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules & + for i in {1..40}; do + do_facet mds1 lsmod | grep -q osd_$mds1_FSTYPE && break + sleep 1 + done + clear_failloc $SINGLEMDS 20 & + start mds1 $(mdsdevname 1) $MDS_MOUNT_OPTS +} +run_test 126 "mount in parallel shouldn't cause a crash" + if ! combined_mgs_mds ; then stop mgs fi