X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=7cea4cb1c0d6cc9563984374e0bd584b6201f1ca;hb=6d314902e6d19229379577aab60d4b20a5b4d2ea;hp=b82f023d239aca5a15170390a5c74bb4f7ef693c;hpb=416e67222b769df490a8be034ef987a596dd8dff;p=fs%2Flustre-release.git diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index b82f023..7cea4cb 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 @@ -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 @@ -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 @@ -2137,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 @@ -2318,6 +2337,19 @@ 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" @@ -2389,6 +2421,7 @@ test_32a() { t32_check for tarball in $tarballs; do + banner "testing $tarball upgrade" t32_test $tarball || let "rc += $?" done return $rc @@ -2402,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 @@ -2417,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 @@ -2433,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 @@ -2449,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 @@ -6123,7 +6160,7 @@ test_83() { 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 "$ost1_FSTYPE" $dev \ @@ -6283,6 +6320,7 @@ test_87() { #LU-6544 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) @@ -6361,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" @@ -6622,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 @@ -6641,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" @@ -8340,6 +8431,7 @@ test_115() { 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) @@ -8353,6 +8445,14 @@ test_115() { 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" @@ -8365,9 +8465,9 @@ test_115() { local mdsdev=$(do_facet $SINGLEMDS "losetup -f") do_facet $SINGLEMDS "losetup $mdsdev $mdsimgname" - local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1)) --device-size=$IMAGESIZE \ + local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1)) \ --mkfsoptions='-O ea_inode,^resize_inode,meta_bg \ - -N 2247484000 -E lazy_itable_init'" + -N 2247484000 -E lazy_itable_init' --device-size=$IMAGESIZE" add mds1 $mds_opts --mgs --reformat $mdsdev || skip_env "format large MDT failed" opts="$(mkfs_opts ost1 $(ostdevname 1)) \ @@ -8530,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) @@ -8539,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" @@ -8655,7 +8755,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" @@ -8678,8 +8778,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 @@ -8859,6 +8959,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